Merge pull request #3772 from k8s-infra-cherrypick-robot/cherry-pick-…

…3766-to-release-1.9 [release-1.9] fix bug preventing AKS autoscaling from being disabled
kubernetes-sigs · Jul 27, 2023 · 9002211 · 9002211
2 parents 15ebbf3 + 46ad58c
commit 9002211
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/azure/scope/managedmachinepool.go b/azure/scope/managedmachinepool.go
@@ -207,7 +207,7 @@ func buildAgentPoolSpec(managedControlPlane *infrav1.AzureManagedControlPlane,
 	}
 
 	if managedMachinePool.Spec.Scaling != nil {
-		agentPoolSpec.EnableAutoScaling = pointer.Bool(true)
+		agentPoolSpec.EnableAutoScaling = true
 		agentPoolSpec.MaxCount = managedMachinePool.Spec.Scaling.MaxSize
 		agentPoolSpec.MinCount = managedMachinePool.Spec.Scaling.MinSize
 	}

diff --git a/azure/scope/managedmachinepool_test.go b/azure/scope/managedmachinepool_test.go
@@ -108,7 +108,7 @@ func TestManagedMachinePoolScope_Autoscaling(t *testing.T) {
 				Mode:              "User",
 				Cluster:           "cluster1",
 				Replicas:          1,
-				EnableAutoScaling: pointer.Bool(true),
+				EnableAutoScaling: true,
 				MinCount:          pointer.Int32(2),
 				MaxCount:          pointer.Int32(10),
 				VnetSubnetID:      "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups//providers/Microsoft.Network/virtualNetworks//subnets/",

diff --git a/azure/services/agentpools/spec.go b/azure/services/agentpools/spec.go
@@ -100,7 +100,7 @@ type AgentPoolSpec struct {
 	NodeTaints []string `json:"nodeTaints,omitempty"`
 
 	// EnableAutoScaling - Whether to enable auto-scaler
-	EnableAutoScaling *bool `json:"enableAutoScaling,omitempty"`
+	EnableAutoScaling bool `json:"enableAutoScaling,omitempty"`
 
 	// AvailabilityZones represents the Availability zones for nodes in the AgentPool.
 	AvailabilityZones []string
@@ -202,7 +202,7 @@ func (s *AgentPoolSpec) Parameters(ctx context.Context, existing interface{}) (p
 				Count:               &s.Replicas,
 				OrchestratorVersion: s.Version,
 				Mode:                containerservice.AgentPoolMode(s.Mode),
-				EnableAutoScaling:   s.EnableAutoScaling,
+				EnableAutoScaling:   pointer.Bool(s.EnableAutoScaling),
 				MinCount:            s.MinCount,
 				MaxCount:            s.MaxCount,
 				NodeLabels:          s.NodeLabels,
@@ -233,7 +233,7 @@ func (s *AgentPoolSpec) Parameters(ctx context.Context, existing interface{}) (p
 		// When autoscaling is set, the count of the nodes differ based on the autoscaler and should not depend on the
 		// count present in MachinePool or AzureManagedMachinePool, hence we should not make an update API call based
 		// on difference in count.
-		if pointer.BoolDeref(s.EnableAutoScaling, false) {
+		if s.EnableAutoScaling {
 			normalizedProfile.Count = existingProfile.Count
 		}
 
@@ -339,7 +339,7 @@ func (s *AgentPoolSpec) Parameters(ctx context.Context, existing interface{}) (p
 		ManagedClusterAgentPoolProfileProperties: &containerservice.ManagedClusterAgentPoolProfileProperties{
 			AvailabilityZones:    availabilityZones,
 			Count:                &s.Replicas,
-			EnableAutoScaling:    s.EnableAutoScaling,
+			EnableAutoScaling:    pointer.Bool(s.EnableAutoScaling),
 			EnableUltraSSD:       s.EnableUltraSSD,
 			KubeletConfig:        kubeletConfig,
 			KubeletDiskType:      containerservice.KubeletDiskType(pointer.StringDeref((*string)(s.KubeletDiskType), "")),

diff --git a/azure/services/agentpools/spec_test.go b/azure/services/agentpools/spec_test.go
@@ -37,7 +37,7 @@ func fakeAgentPool(changes ...func(*AgentPoolSpec)) AgentPoolSpec {
 		ResourceGroup:     "fake-rg",
 		Cluster:           "fake-cluster",
 		AvailabilityZones: []string{"fake-zone"},
-		EnableAutoScaling: pointer.Bool(true),
+		EnableAutoScaling: true,
 		EnableUltraSSD:    pointer.Bool(true),
 		KubeletDiskType:   (*infrav1.KubeletDiskType)(pointer.String("fake-kubelet-disk-type")),
 		MaxCount:          pointer.Int32(5),
@@ -72,7 +72,7 @@ func withReplicas(replicas int32) func(*AgentPoolSpec) {
 
 func withAutoscaling(enabled bool) func(*AgentPoolSpec) {
 	return func(pool *AgentPoolSpec) {
-		pool.EnableAutoScaling = pointer.Bool(enabled)
+		pool.EnableAutoScaling = enabled
 	}
 }
 

diff --git a/azure/services/managedclusters/spec_test.go b/azure/services/managedclusters/spec_test.go
@@ -226,6 +226,7 @@ func getSampleManagedCluster() containerservice.ManagedCluster {
 					Tags: map[string]*string{
 						"test-tag": pointer.String("test-value"),
 					},
+					EnableAutoScaling: pointer.Bool(false),
 				},
 				{
 					Name:                pointer.String("test-agentpool-1"),
@@ -241,6 +242,7 @@ func getSampleManagedCluster() containerservice.ManagedCluster {
 					Tags: map[string]*string{
 						"test-tag": pointer.String("test-value"),
 					},
+					EnableAutoScaling: pointer.Bool(false),
 				},
 			},
 			LinuxProfile: &containerservice.LinuxProfile{

diff --git a/controllers/azuremanagedmachinepool_controller_test.go b/controllers/azuremanagedmachinepool_controller_test.go
@@ -263,7 +263,7 @@ func fakeAgentPool(changes ...func(*agentpools.AgentPoolSpec)) agentpools.AgentP
 		ResourceGroup:     "fake-rg",
 		Cluster:           "fake-cluster",
 		AvailabilityZones: []string{"fake-zone"},
-		EnableAutoScaling: pointer.Bool(true),
+		EnableAutoScaling: true,
 		EnableUltraSSD:    pointer.Bool(true),
 		KubeletDiskType:   (*infrav1.KubeletDiskType)(pointer.String("fake-kubelet-disk-type")),
 		MaxCount:          pointer.Int32(5),