Merge pull request #1976 from zmalik/zm/unify-agentpool-spec

build aks agentpool spec through one method

Author: k8s-ci-robot

azure/scope/managedcontrolplane.go

@@ -471,9 +471,9 @@ func (s *ManagedControlPlaneScope) ManagedClusterSpec() (azure.ManagedClusterSpe
 	return managedClusterSpec, nil
 }
 
-// GetAgentPoolSpecs gets a slice of azure.AgentPoolSpec for the list of agent pools.
-func (s *ManagedControlPlaneScope) GetAgentPoolSpecs(ctx context.Context) ([]azure.AgentPoolSpec, error) {
-	ctx, log, done := tele.StartSpanWithLogger(ctx, "scope.ManagedControlPlaneScope.GetAgentPoolSpecs")
+// GetAllAgentPoolSpecs gets a slice of azure.AgentPoolSpec for the list of agent pools.
+func (s *ManagedControlPlaneScope) GetAllAgentPoolSpecs(ctx context.Context) ([]azure.AgentPoolSpec, error) {
+	ctx, log, done := tele.StartSpanWithLogger(ctx, "scope.ManagedControlPlaneScope.GetAllAgentPoolSpecs")
 	defer done()
 
 	if len(s.AllNodePools) == 0 {
@@ -495,7 +495,7 @@ func (s *ManagedControlPlaneScope) GetAgentPoolSpecs(ctx context.Context) ([]azu
 		ammps           = make([]azure.AgentPoolSpec, 0, len(s.AllNodePools))
 		foundSystemPool = false
 	)
-	for _, pool := range s.AllNodePools {
+	for i, pool := range s.AllNodePools {
 		// Fetch the owning MachinePool.
 
 		ownerPool, err := capiexputil.GetOwnerMachinePool(ctx, s.Client, pool.ObjectMeta)
@@ -512,34 +512,14 @@ func (s *ManagedControlPlaneScope) GetAgentPoolSpecs(ctx context.Context) ([]azu
 			foundSystemPool = true
 		}
 
-		ammp := azure.AgentPoolSpec{
-			Name:              to.String(pool.Spec.Name),
-			SKU:               pool.Spec.SKU,
-			Replicas:          1,
-			OSDiskSizeGB:      0,
-			Mode:              pool.Spec.Mode,
-			MaxPods:           pool.Spec.MaxPods,
-			AvailabilityZones: pool.Spec.AvailabilityZones,
-			OsDiskType:        pool.Spec.OsDiskType,
-		}
-
-		// Set optional values
-		if pool.Spec.OSDiskSizeGB != nil {
-			ammp.OSDiskSizeGB = *pool.Spec.OSDiskSizeGB
-		}
-
-		if ownerPool.Spec.Replicas != nil {
-			ammp.Replicas = *ownerPool.Spec.Replicas
-		}
-
 		if ownerPool.Spec.Template.Spec.Version != nil {
 			version := *ownerPool.Spec.Template.Spec.Version
 			if semver.Compare(version, s.ControlPlane.Spec.Version) > 0 {
 				return nil, errors.New("MachinePool version cannot be greater than the AzureManagedControlPlane version")
 			}
-			ammp.Version = to.StringPtr(strings.TrimPrefix(version, "v"))
 		}
 
+		ammp := buildAgentPoolSpec(s.ControlPlane, ownerPool, &s.AllNodePools[i])
 		ammps = append(ammps, ammp)
 	}
 
@@ -552,44 +532,50 @@ func (s *ManagedControlPlaneScope) GetAgentPoolSpecs(ctx context.Context) ([]azu
 
 // AgentPoolSpec returns an azure.AgentPoolSpec for currently reconciled AzureManagedMachinePool.
 func (s *ManagedControlPlaneScope) AgentPoolSpec() azure.AgentPoolSpec {
+	return buildAgentPoolSpec(s.ControlPlane, s.MachinePool, s.InfraMachinePool)
+}
+
+func buildAgentPoolSpec(managedControlPlane *infrav1exp.AzureManagedControlPlane,
+	machinePool *expv1.MachinePool,
+	managedMachinePool *infrav1exp.AzureManagedMachinePool) azure.AgentPoolSpec {
 	var normalizedVersion *string
-	if s.MachinePool.Spec.Template.Spec.Version != nil {
-		v := strings.TrimPrefix(*s.MachinePool.Spec.Template.Spec.Version, "v")
+	if machinePool.Spec.Template.Spec.Version != nil {
+		v := strings.TrimPrefix(*machinePool.Spec.Template.Spec.Version, "v")
 		normalizedVersion = &v
 	}
 
 	replicas := int32(1)
-	if s.MachinePool.Spec.Replicas != nil {
-		replicas = *s.MachinePool.Spec.Replicas
+	if machinePool.Spec.Replicas != nil {
+		replicas = *machinePool.Spec.Replicas
 	}
 
 	agentPoolSpec := azure.AgentPoolSpec{
-		Name:          to.String(s.InfraMachinePool.Spec.Name),
-		ResourceGroup: s.ControlPlane.Spec.ResourceGroupName,
-		Cluster:       s.ControlPlane.Name,
-		SKU:           s.InfraMachinePool.Spec.SKU,
+		Name:          to.String(managedMachinePool.Spec.Name),
+		ResourceGroup: managedControlPlane.Spec.ResourceGroupName,
+		Cluster:       managedControlPlane.Name,
+		SKU:           managedMachinePool.Spec.SKU,
 		Replicas:      replicas,
 		Version:       normalizedVersion,
 		VnetSubnetID: azure.SubnetID(
-			s.ControlPlane.Spec.SubscriptionID,
-			s.ControlPlane.Spec.ResourceGroupName,
-			s.ControlPlane.Spec.VirtualNetwork.Name,
-			s.ControlPlane.Spec.VirtualNetwork.Subnet.Name,
+			managedControlPlane.Spec.SubscriptionID,
+			managedControlPlane.Spec.ResourceGroupName,
+			managedControlPlane.Spec.VirtualNetwork.Name,
+			managedControlPlane.Spec.VirtualNetwork.Subnet.Name,
 		),
-		Mode:              s.InfraMachinePool.Spec.Mode,
-		MaxPods:           s.InfraMachinePool.Spec.MaxPods,
-		AvailabilityZones: s.InfraMachinePool.Spec.AvailabilityZones,
-		OsDiskType:        s.InfraMachinePool.Spec.OsDiskType,
+		Mode:              managedMachinePool.Spec.Mode,
+		MaxPods:           managedMachinePool.Spec.MaxPods,
+		AvailabilityZones: managedMachinePool.Spec.AvailabilityZones,
+		OsDiskType:        managedMachinePool.Spec.OsDiskType,
 	}
 
-	if s.InfraMachinePool.Spec.OSDiskSizeGB != nil {
-		agentPoolSpec.OSDiskSizeGB = *s.InfraMachinePool.Spec.OSDiskSizeGB
+	if managedMachinePool.Spec.OSDiskSizeGB != nil {
+		agentPoolSpec.OSDiskSizeGB = *managedMachinePool.Spec.OSDiskSizeGB
 	}
 
-	if s.InfraMachinePool.Spec.Scaling != nil {
+	if managedMachinePool.Spec.Scaling != nil {
 		agentPoolSpec.EnableAutoScaling = to.BoolPtr(true)
-		agentPoolSpec.MaxCount = s.InfraMachinePool.Spec.Scaling.MaxSize
-		agentPoolSpec.MinCount = s.InfraMachinePool.Spec.Scaling.MinSize
+		agentPoolSpec.MaxCount = managedMachinePool.Spec.Scaling.MaxSize
+		agentPoolSpec.MinCount = managedMachinePool.Spec.Scaling.MinSize
 	}
 
 	return agentPoolSpec

azure/scope/managedcontrolplane_test.go

@@ -169,10 +169,12 @@ func TestManagedControlPlaneScope_PoolVersion(t *testing.T) {
 			},
 			Expected: []azure.AgentPoolSpec{
 				{
-					Name:     "pool0",
-					SKU:      "Standard_D2s_v3",
-					Replicas: 1,
-					Mode:     "System",
+					Name:         "pool0",
+					SKU:          "Standard_D2s_v3",
+					Replicas:     1,
+					Mode:         "System",
+					Cluster:      "cluster1",
+					VnetSubnetID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups//providers/Microsoft.Network/virtualNetworks//subnets/",
 				},
 			},
 		},
@@ -204,11 +206,13 @@ func TestManagedControlPlaneScope_PoolVersion(t *testing.T) {
 			},
 			Expected: []azure.AgentPoolSpec{
 				{
-					Name:     "pool0",
-					SKU:      "Standard_D2s_v3",
-					Mode:     "System",
-					Replicas: 1,
-					Version:  to.StringPtr("1.21.1"),
+					Name:         "pool0",
+					SKU:          "Standard_D2s_v3",
+					Mode:         "System",
+					Replicas:     1,
+					Version:      to.StringPtr("1.21.1"),
+					Cluster:      "cluster1",
+					VnetSubnetID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups//providers/Microsoft.Network/virtualNetworks//subnets/",
 				},
 			},
 		},
@@ -250,7 +254,7 @@ func TestManagedControlPlaneScope_PoolVersion(t *testing.T) {
 			c.Input.Client = fakeClient
 			s, err := NewManagedControlPlaneScope(context.TODO(), c.Input)
 			g.Expect(err).To(Succeed())
-			agentPools, err := s.GetAgentPoolSpecs(context.TODO())
+			agentPools, err := s.GetAllAgentPoolSpecs(context.TODO())
 			if err != nil {
 				g.Expect(err.Error()).To(Equal(c.Err))
 			} else {
@@ -351,7 +355,7 @@ 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())
+			agentPools, err := s.GetAllAgentPoolSpecs(context.TODO())
 			g.Expect(err).To(Succeed())
 			g.Expect(agentPools[0].MaxPods).To(Equal(c.Expected.MaxPods))
 		})

azure/services/managedclusters/managedclusters.go

@@ -44,7 +44,7 @@ var (
 type ManagedClusterScope interface {
 	azure.ClusterDescriber
 	ManagedClusterSpec() (azure.ManagedClusterSpec, error)
-	GetAgentPoolSpecs(ctx context.Context) ([]azure.AgentPoolSpec, error)
+	GetAllAgentPoolSpecs(ctx context.Context) ([]azure.AgentPoolSpec, error)
 	SetControlPlaneEndpoint(clusterv1.APIEndpoint)
 	MakeEmptyKubeConfigSecret() corev1.Secret
 	GetKubeConfigData() []byte
@@ -168,7 +168,7 @@ func (s *Service) Reconcile(ctx context.Context) error {
 	if azure.ResourceNotFound(err) {
 		isCreate = true
 		// Add system agent pool to cluster spec that will be submitted to the API
-		managedClusterSpec.AgentPools, err = s.Scope.GetAgentPoolSpecs(ctx)
+		managedClusterSpec.AgentPools, err = s.Scope.GetAllAgentPoolSpecs(ctx)
 		if err != nil {
 			return errors.Wrapf(err, "failed to get system agent pool specs for managed cluster %s", s.Scope.ClusterName())
 		}

azure/services/managedclusters/managedclusters_test.go

@@ -130,7 +130,7 @@ func TestReconcile(t *testing.T) {
 					Name:              "my-managedcluster",
 					ResourceGroupName: "my-rg",
 				}, nil)
-				s.GetAgentPoolSpecs(gomockinternal.AContext()).AnyTimes().Return([]azure.AgentPoolSpec{
+				s.GetAllAgentPoolSpecs(gomockinternal.AContext()).AnyTimes().Return([]azure.AgentPoolSpec{
 					{
 						Name:         "my-agentpool",
 						SKU:          "Standard_D4s_v3",