Merge pull request #2083 from k8s-infra-cherrypick-robot/cherry-pick-1945-to-release-1.1

[release-1.1] Set max pods for the first time creation of ManagedControlplane (AKS) cluster

Author: k8s-ci-robot

azure/scope/managedcontrolplane.go

@@ -499,6 +499,7 @@ func (s *ManagedControlPlaneScope) GetAgentPoolSpecs(ctx context.Context) ([]azu
 			Replicas:          1,
 			OSDiskSizeGB:      0,
 			Mode:              pool.Spec.Mode,
+			MaxPods:           pool.Spec.MaxPods,
 			AvailabilityZones: pool.Spec.AvailabilityZones,
 		}
 
@@ -548,6 +549,7 @@ func (s *ManagedControlPlaneScope) AgentPoolSpec() azure.AgentPoolSpec {
 			s.ControlPlane.Spec.VirtualNetwork.Subnet.Name,
 		),
 		Mode:              s.InfraMachinePool.Spec.Mode,
+		MaxPods:           s.InfraMachinePool.Spec.MaxPods,
 		AvailabilityZones: s.InfraMachinePool.Spec.AvailabilityZones,
 	}
 
@@ -561,10 +563,6 @@ func (s *ManagedControlPlaneScope) AgentPoolSpec() azure.AgentPoolSpec {
 		agentPoolSpec.MinCount = s.InfraMachinePool.Spec.Scaling.MinSize
 	}
 
-	if s.InfraMachinePool.Spec.MaxPods != nil {
-		agentPoolSpec.MaxPods = s.InfraMachinePool.Spec.MaxPods
-	}
-
 	return agentPoolSpec
 }
 

azure/scope/managedcontrolplane_test.go

@@ -202,7 +202,7 @@ func TestManagedControlPlaneScope_MaxPods(t *testing.T) {
 			Expected: azure.AgentPoolSpec{
 				Name:         "pool1",
 				SKU:          "Standard_D2s_v3",
-				Mode:         "User",
+				Mode:         "System",
 				Cluster:      "cluster1",
 				Replicas:     1,
 				MaxPods:      to.Int32Ptr(12),
@@ -221,6 +221,9 @@ func TestManagedControlPlaneScope_MaxPods(t *testing.T) {
 			g.Expect(err).To(Succeed())
 			agentPool := s.AgentPoolSpec()
 			g.Expect(agentPool).To(Equal(c.Expected))
+			agentPools, err := s.GetAgentPoolSpecs(context.TODO())
+			g.Expect(err).To(Succeed())
+			g.Expect(agentPools[0].MaxPods).To(Equal(c.Expected.MaxPods))
 		})
 	}
 }
@@ -259,7 +262,7 @@ func getAzureMachinePoolWithScaling(name string, min, max int32) *infrav1.AzureM
 }
 
 func getAzureMachinePoolWithMaxPods(name string, maxPods int32) *infrav1.AzureManagedMachinePool {
-	managedPool := getAzureMachinePool(name, infrav1.NodePoolModeUser)
+	managedPool := getAzureMachinePool(name, infrav1.NodePoolModeSystem)
 	managedPool.Spec.MaxPods = to.Int32Ptr(maxPods)
 	return managedPool
 }