kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove instance group mirroring code

This commit is contained in:
John Gardiner Myers 2021-06-17 22:35:22 -07:00
parent e64c9c2c45
commit 8ab6747188
3 changed files with 0 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkg/client/simple/vfsclientset/instancegroup.go
View File

@ -31,7 +31,6 @@ import (
kopsapi "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/apis/kops/validation"
kopsinternalversion "k8s.io/kops/pkg/client/clientset_generated/clientset/typed/kops/internalversion"
"k8s.io/kops/util/pkg/vfs"
)
type InstanceGroupVFS struct {
@ -41,31 +40,6 @@ type InstanceGroupVFS struct {
cluster *kopsapi.Cluster
}
type InstanceGroupMirror interface {
WriteMirror(ig *kopsapi.InstanceGroup) error
}
var _ InstanceGroupMirror = &InstanceGroupVFS{}
func NewInstanceGroupMirror(cluster *kopsapi.Cluster, configBase vfs.Path) InstanceGroupMirror {
if cluster == nil || cluster.Name == "" {
klog.Fatalf("cluster / cluster.Name is required")
}
clusterName := cluster.Name
kind := "InstanceGroup"
r := &InstanceGroupVFS{
cluster: cluster,
clusterName: clusterName,
}
r.init(kind, configBase.Join("instancegroup"), StoreVersion)
r.validate = func(o runtime.Object) error {
return validation.ValidateInstanceGroup(o.(*kopsapi.InstanceGroup), nil).ToAggregate()
}
return r
}
func newInstanceGroupVFS(c *VFSClientset, cluster *kopsapi.Cluster) *InstanceGroupVFS {
if cluster == nil || cluster.Name == "" {
klog.Fatalf("cluster / cluster.Name is required")
@ -151,15 +125,6 @@ func (c *InstanceGroupVFS) Update(ctx context.Context, g *kopsapi.InstanceGroup,
return g, nil
}
func (c *InstanceGroupVFS) WriteMirror(g *kopsapi.InstanceGroup) error {
err := c.writeConfig(c.cluster, c.basePath.Join(g.Name), g)
if err != nil {
return fmt.Errorf("error writing %s: %v", c.kind, err)
}
return nil
}
func (c *InstanceGroupVFS) Delete(ctx context.Context, name string, options metav1.DeleteOptions) error {
return c.delete(ctx, name, options)
}

1
upup/pkg/fi/cloudup/BUILD.bazel generated
View File

@ -39,7 +39,6 @@ go_library(
"//pkg/apis/nodeup:go_default_library",
"//pkg/assets:go_default_library",
"//pkg/client/simple:go_default_library",
"//pkg/client/simple/vfsclientset:go_default_library",
"//pkg/dns:go_default_library",
"//pkg/featureflag:go_default_library",
"//pkg/model:go_default_library",

16
upup/pkg/fi/cloudup/apply_cluster.go
View File

@ -42,7 +42,6 @@ import (
"k8s.io/kops/pkg/apis/nodeup"
"k8s.io/kops/pkg/assets"
"k8s.io/kops/pkg/client/simple"
"k8s.io/kops/pkg/client/simple/vfsclientset"
"k8s.io/kops/pkg/dns"
"k8s.io/kops/pkg/featureflag"
"k8s.io/kops/pkg/model"
@ -770,21 +769,6 @@ func (c *ApplyClusterCmd) Run(ctx context.Context) error {
if err != nil {
return fmt.Errorf("error writing completed cluster spec: %v", err)
}
vfsMirror := vfsclientset.NewInstanceGroupMirror(cluster, configBase)
for _, g := range c.InstanceGroups {
// TODO: We need to update the mirror (below), but do we need to update the primary?
_, err := c.Clientset.InstanceGroupsFor(c.Cluster).Update(ctx, g, metav1.UpdateOptions{})
if err != nil {
return fmt.Errorf("error writing InstanceGroup %q to registry: %v", g.ObjectMeta.Name, err)
}
// TODO: Don't write if vfsMirror == c.ClientSet
if err := vfsMirror.WriteMirror(g); err != nil {
return fmt.Errorf("error writing instance group spec to mirror: %v", err)
}
}
}
var options fi.RunTasksOptions