Merge pull request #6 from dormullor/main

Fix Instance group equality check

.golangci.yml

@@ -1,5 +1,5 @@
 run:
-  deadline: 2m
+  deadline: 5m
 
   skip-files:
   - "zz_generated\\..+\\.go$"

internal/util/util.go

@@ -227,19 +227,18 @@ func ClusterResourceUpToDate(old, new *kopsapi.ClusterSpec) bool {
 
 // InstanceGroupListResourceUpToDate checks if the instance group list resource is up to date
 func InstanceGroupListResourceUpToDate(old []kopsapi.InstanceGroupSpec, new *kopsapi.InstanceGroupList) bool {
-	for index := range old {
-		if !InstanceGroupResourceUpToDate(&old[index], &new.Items[index].Spec) {
-			return false
+	for _, oldInstance := range old {
+		for _, newInstance := range new.Items {
+			if oldInstance.NodeLabels["kops.k8s.io/instancegroup"] == newInstance.Spec.NodeLabels["kops.k8s.io/instancegroup"] {
+				if !reflect.DeepEqual(oldInstance, newInstance.Spec) {
+					return false
+				}
+			}
 		}
 	}
 	return true
 }
 
-// InstanceGroupResourceUpToDate checks if the instance group resource is up to date
-func InstanceGroupResourceUpToDate(old, new *kopsapi.InstanceGroupSpec) bool {
-	return reflect.DeepEqual(old, new)
-}
-
 // GetClusterStatus returns the cluster status
 func GetClusterStatus(kopsCluster *kopsapi.Cluster, cloud fi.Cloud) (*kopsapi.ClusterStatus, error) {
 	status, err := cloud.FindClusterStatus(kopsCluster)