Merge pull request #1104 from kahun/fix/autoscaling

Fix GKE autoscaling conditions in reconciliation process

Author: k8s-ci-robot

cloud/services/container/nodepools/reconcile.go

@@ -420,7 +420,8 @@ func (s *Service) checkDiffAndPrepareUpdateAutoscaling(existingNodePool *contain
 	setNodePoolAutoscalingRequest := containerpb.SetNodePoolAutoscalingRequest{
 		Name: s.scope.NodePoolFullName(),
 	}
-	if !cmp.Equal(desiredAutoscaling, existingNodePool.Autoscaling) {
+
+	if !cmp.Equal(desiredAutoscaling, existingNodePool.Autoscaling, cmpopts.IgnoreUnexported(containerpb.NodePoolAutoscaling{})) {
 		needUpdate = true
 		setNodePoolAutoscalingRequest.Autoscaling = desiredAutoscaling
 	}

exp/api/v1beta1/types.go

@@ -81,27 +81,30 @@ func convertToSdkLocationPolicy(locationPolicy ManagedNodePoolLocationPolicy) co
 
 // ConvertToSdkAutoscaling converts node pool autoscaling config to a value that is used by GCP SDK.
 func ConvertToSdkAutoscaling(autoscaling *NodePoolAutoScaling) *containerpb.NodePoolAutoscaling {
-	if autoscaling == nil {
-		return nil
-	}
 	sdkAutoscaling := containerpb.NodePoolAutoscaling{
-		Enabled: true, // enable autoscaling by default
-	}
-	// set fields
-	if autoscaling.MinCount != nil {
-		sdkAutoscaling.TotalMinNodeCount = *autoscaling.MinCount
-	}
-	if autoscaling.MaxCount != nil {
-		sdkAutoscaling.TotalMaxNodeCount = *autoscaling.MaxCount
-	}
-	if autoscaling.EnableAutoscaling != nil {
-		sdkAutoscaling.Enabled = *autoscaling.EnableAutoscaling
+		Enabled:           true, // enable autoscaling by default
+		TotalMinNodeCount: 0,
+		TotalMaxNodeCount: 1,
+		LocationPolicy:    convertToSdkLocationPolicy(ManagedNodePoolLocationPolicyBalanced),
 	}
-	if autoscaling.LocationPolicy != nil {
-		sdkAutoscaling.LocationPolicy = convertToSdkLocationPolicy(*autoscaling.LocationPolicy)
-	} else if sdkAutoscaling.Enabled {
-		// if location policy is not specified and autoscaling is enabled, default location policy to "any"
-		sdkAutoscaling.LocationPolicy = convertToSdkLocationPolicy(ManagedNodePoolLocationPolicyAny)
+	if autoscaling != nil {
+		// set fields
+		if autoscaling.MinCount != nil {
+			sdkAutoscaling.TotalMinNodeCount = *autoscaling.MinCount
+		}
+		if autoscaling.MaxCount != nil {
+			sdkAutoscaling.TotalMaxNodeCount = *autoscaling.MaxCount
+		}
+		if autoscaling.LocationPolicy != nil {
+			sdkAutoscaling.LocationPolicy = convertToSdkLocationPolicy(*autoscaling.LocationPolicy)
+		}
+		if autoscaling.EnableAutoscaling != nil {
+			if !*autoscaling.EnableAutoscaling {
+				sdkAutoscaling = containerpb.NodePoolAutoscaling{
+					Enabled: false,
+				}
+			}
+		}
 	}
 
 	return &sdkAutoscaling

tilt-provider.json

@@ -8,7 +8,8 @@
       "go.sum",
       "api",
       "cloud",
-      "controllers"
+      "controllers",
+      "exp"
     ],
     "label": "CAPG"
   }