From 4f2b5655bbabedfff2dcfcb2e9d6509b67f818c5 Mon Sep 17 00:00:00 2001
From: Ole Markus With <o.with@sportradar.com>
Date: Sat, 17 Sep 2022 11:41:20 +0200
Subject: [PATCH] Don't write populated IG state after editing IG

---
 cmd/kops/edit_instancegroup.go         | 8 ++++----
 cmd/kops/test/edit_instance_group.yaml | 9 ---------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/cmd/kops/edit_instancegroup.go b/cmd/kops/edit_instancegroup.go
index 47cf77d2b4..7ebb99a004 100644
--- a/cmd/kops/edit_instancegroup.go
+++ b/cmd/kops/edit_instancegroup.go
@@ -157,7 +157,7 @@ func RunEditInstanceGroup(ctx context.Context, f *util.Factory, out io.Writer, o
 			return err
 		}
 
-		failure, err := updateInstanceGroup(ctx, clientset, channel, cluster, oldGroup, newGroup)
+		failure, err := updateInstanceGroup(ctx, clientset, channel, cluster, newGroup)
 		if err != nil {
 			return err
 		}
@@ -263,7 +263,7 @@ func RunEditInstanceGroup(ctx context.Context, f *util.Factory, out io.Writer, o
 			continue
 		}
 
-		failure, err := updateInstanceGroup(ctx, clientset, channel, cluster, oldGroup, newGroup)
+		failure, err := updateInstanceGroup(ctx, clientset, channel, cluster, newGroup)
 		if err != nil {
 			return preservedFile(err, file, out)
 		}
@@ -280,7 +280,7 @@ func RunEditInstanceGroup(ctx context.Context, f *util.Factory, out io.Writer, o
 	}
 }
 
-func updateInstanceGroup(ctx context.Context, clientset simple.Clientset, channel *api.Channel, cluster *api.Cluster, oldGroup, newGroup *api.InstanceGroup) (string, error) {
+func updateInstanceGroup(ctx context.Context, clientset simple.Clientset, channel *api.Channel, cluster *api.Cluster, newGroup *api.InstanceGroup) (string, error) {
 	cloud, err := cloudup.BuildCloud(cluster)
 	if err != nil {
 		return "", err
@@ -310,6 +310,6 @@ func updateInstanceGroup(ctx context.Context, clientset simple.Clientset, channe
 	}
 
 	// Note we perform as much validation as we can, before writing a bad config
-	_, err = clientset.InstanceGroupsFor(cluster).Update(ctx, fullGroup, metav1.UpdateOptions{})
+	_, err = clientset.InstanceGroupsFor(cluster).Update(ctx, newGroup, metav1.UpdateOptions{})
 	return "", err
 }
diff --git a/cmd/kops/test/edit_instance_group.yaml b/cmd/kops/test/edit_instance_group.yaml
index 59a1c09e50..7179495cff 100644
--- a/cmd/kops/test/edit_instance_group.yaml
+++ b/cmd/kops/test/edit_instance_group.yaml
@@ -8,16 +8,7 @@ metadata:
   name: nodes
 spec:
   image: ami-xyz
-  kubelet:
-    nodeLabels:
-      kubernetes.io/role: node
-      node-role.kubernetes.io/node: ""
-    taints:
-    - e2etest:NoSchedule
-  machineType: t2.medium
-  manager: CloudGroup
   maxSize: 10
-  minSize: 2
   role: Node
   subnets:
   - subnet-us-test-1a