add support for aks node labels

Author: zmalik

azure/scope/managedcontrolplane.go

@@ -578,6 +578,13 @@ func buildAgentPoolSpec(managedControlPlane *infrav1exp.AzureManagedControlPlane
 		agentPoolSpec.MinCount = managedMachinePool.Spec.Scaling.MinSize
 	}
 
+	if len(managedMachinePool.Spec.NodeLabels) > 0 {
+		agentPoolSpec.NodeLabels = make(map[string]*string, len(managedMachinePool.Spec.NodeLabels))
+		for k, v := range managedMachinePool.Spec.NodeLabels {
+			agentPoolSpec.NodeLabels[k] = to.StringPtr(v)
+		}
+	}
+
 	return agentPoolSpec
 }
 

azure/scope/managedcontrolplane_test.go

@@ -131,6 +131,111 @@ func TestManagedControlPlaneScope_Autoscaling(t *testing.T) {
 	}
 }
 
+func TestManagedControlPlaneScope_NodeLabels(t *testing.T) {
+	scheme := runtime.NewScheme()
+	_ = capiv1exp.AddToScheme(scheme)
+	_ = infrav1.AddToScheme(scheme)
+
+	cases := []struct {
+		Name     string
+		Input    ManagedControlPlaneScopeParams
+		Expected azure.AgentPoolSpec
+	}{
+		{
+			Name: "Without node labels",
+			Input: ManagedControlPlaneScopeParams{
+				AzureClients: AzureClients{
+					Authorizer: autorest.NullAuthorizer{},
+				},
+				Cluster: &clusterv1.Cluster{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "cluster1",
+						Namespace: "default",
+					},
+				},
+				ControlPlane: &infrav1.AzureManagedControlPlane{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "cluster1",
+						Namespace: "default",
+					},
+					Spec: infrav1.AzureManagedControlPlaneSpec{
+						SubscriptionID: "00000000-0000-0000-0000-000000000000",
+					},
+				},
+				MachinePool:      getMachinePool("pool0"),
+				InfraMachinePool: getAzureMachinePool("pool0", infrav1.NodePoolModeSystem),
+				PatchTarget:      getAzureMachinePool("pool0", infrav1.NodePoolModeSystem),
+			},
+			Expected: azure.AgentPoolSpec{
+
+				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/",
+			},
+		},
+		{
+			Name: "With node labels",
+			Input: ManagedControlPlaneScopeParams{
+				AzureClients: AzureClients{
+					Authorizer: autorest.NullAuthorizer{},
+				},
+				Cluster: &clusterv1.Cluster{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "cluster1",
+						Namespace: "default",
+					},
+				},
+				ControlPlane: &infrav1.AzureManagedControlPlane{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "cluster1",
+						Namespace: "default",
+					},
+					Spec: infrav1.AzureManagedControlPlaneSpec{
+						SubscriptionID: "00000000-0000-0000-0000-000000000000",
+					},
+				},
+				MachinePool: getMachinePool("pool1"),
+				InfraMachinePool: getAzureMachinePoolWithLabels("pool1", map[string]string{
+					"custom": "default",
+				}),
+				PatchTarget: getAzureMachinePoolWithLabels("pool1", map[string]string{
+					"custom": "default",
+				}),
+			},
+			Expected: azure.AgentPoolSpec{
+				Name:     "pool1",
+				SKU:      "Standard_D2s_v3",
+				Mode:     "System",
+				Cluster:  "cluster1",
+				Replicas: 1,
+				NodeLabels: map[string]*string{
+					"custom": to.StringPtr("default"),
+				},
+				VnetSubnetID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups//providers/Microsoft.Network/virtualNetworks//subnets/",
+			},
+		},
+	}
+
+	for _, c := range cases {
+		c := c
+		t.Run(c.Name, func(t *testing.T) {
+			g := NewWithT(t)
+			fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(c.Input.MachinePool, c.Input.InfraMachinePool, c.Input.ControlPlane).Build()
+			c.Input.Client = fakeClient
+			s, err := NewManagedControlPlaneScope(context.TODO(), c.Input)
+			g.Expect(err).To(Succeed())
+			agentPool := s.AgentPoolSpec()
+			g.Expect(agentPool).To(Equal(c.Expected))
+			agentPools, err := s.GetAllAgentPoolSpecs(context.TODO())
+			g.Expect(err).To(Succeed())
+			g.Expect(agentPools[0].NodeLabels).To(Equal(c.Expected.NodeLabels))
+		})
+	}
+}
+
 func TestManagedControlPlaneScope_PoolVersion(t *testing.T) {
 	scheme := runtime.NewScheme()
 	_ = capiv1exp.AddToScheme(scheme)
@@ -502,6 +607,12 @@ func getAzureMachinePoolWithOsDiskType(name string, osDiskType string) *infrav1.
 	return managedPool
 }
 
+func getAzureMachinePoolWithLabels(name string, nodeLabels map[string]string) *infrav1.AzureManagedMachinePool {
+	managedPool := getAzureMachinePool(name, infrav1.NodePoolModeSystem)
+	managedPool.Spec.NodeLabels = nodeLabels
+	return managedPool
+}
+
 func getMachinePool(name string) *capiv1exp.MachinePool {
 	return &capiv1exp.MachinePool{
 		ObjectMeta: metav1.ObjectMeta{

azure/services/agentpools/agentpools.go

@@ -82,6 +82,7 @@ func (s *Service) Reconcile(ctx context.Context) error {
 			AvailabilityZones:   &agentPoolSpec.AvailabilityZones,
 			MaxPods:             agentPoolSpec.MaxPods,
 			OsDiskType:          containerservice.OSDiskType(to.String(agentPoolSpec.OsDiskType)),
+			NodeLabels:          agentPoolSpec.NodeLabels,
 		},
 	}
 

azure/types.go

@@ -363,6 +363,9 @@ type AgentPoolSpec struct {
 	// Minimum number of nodes for auto-scaling
 	MinCount *int32 `json:"minCount,omitempty"`
 
+	// Node labels - labels for all of the nodes present in node pool
+	NodeLabels map[string]*string `json:"nodeLabels,omitempty"`
+
 	// EnableAutoScaling - Whether to enable auto-scaler
 	EnableAutoScaling *bool `json:"enableAutoScaling,omitempty"`
 

config/crd/bases/infrastructure.cluster.x-k8s.io_azuremanagedmachinepools.yaml

@@ -217,6 +217,12 @@ spec:
                 description: Name - name of the agent pool. If not specified, CAPZ
                   uses the name of the CR as the agent pool name.
                 type: string
+              nodeLabels:
+                additionalProperties:
+                  type: string
+                description: Node labels - labels for all of the nodes present in
+                  node pool
+                type: object
               osDiskSizeGB:
                 description: OSDiskSizeGB is the disk size for every machine in this
                   agent pool. If you specify 0, it will apply the default osDisk size

docs/book/src/topics/managedcluster.md

@@ -263,6 +263,25 @@ spec:
     maxSize: 10
 ```
 
+### AKS Node Labels to an Agent Pool
+
+You can configure the `NodeLabels` value for each AKS node pool (`AzureManagedMachinePool`) that you define in your spec.
+
+Below an example `nodeLabels` configuration is assigned to `agentpool0`, specifying that each node in the pool will add a label `dedicated : kafka`
+
+```
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: AzureManagedMachinePool
+metadata:
+  name: agentpool0
+spec:
+  mode: System
+  osDiskSizeGB: 512
+  sku: Standard_D2s_v3
+  nodeLabels:
+    dedicated: kafka 
+```
+
 ### AKS Node Pool MaxPods configuration
 
 You can configure the `MaxPods` value for each AKS node pool (`AzureManagedMachinePool`) that you define in your spec (see [here](https://docs.microsoft.com/en-us/azure/aks/configure-azure-cni#configure-maximum---new-clusters) for the official AKS documentation). This corresponds to the kubelet `--max-pods` configuration (official kubelet configuration documentation can be found [here](https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet/)).

exp/api/v1alpha3/azuremanagedmachinepool_conversion.go

@@ -42,6 +42,7 @@ func (src *AzureManagedMachinePool) ConvertTo(dstRaw conversion.Hub) error { //
 	dst.Spec.AvailabilityZones = restored.Spec.AvailabilityZones
 	dst.Spec.MaxPods = restored.Spec.MaxPods
 	dst.Spec.OsDiskType = restored.Spec.OsDiskType
+	dst.Spec.NodeLabels = restored.Spec.NodeLabels
 
 	dst.Status.LongRunningOperationStates = restored.Status.LongRunningOperationStates
 	dst.Status.Conditions = restored.Status.Conditions

exp/api/v1alpha3/zz_generated.conversion.go

@@ -42,6 +42,7 @@ func (src *AzureManagedMachinePool) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.AvailabilityZones = restored.Spec.AvailabilityZones
 	dst.Spec.MaxPods = restored.Spec.MaxPods
 	dst.Spec.OsDiskType = restored.Spec.OsDiskType
+	dst.Spec.NodeLabels = restored.Spec.NodeLabels
 
 	dst.Status.LongRunningOperationStates = restored.Status.LongRunningOperationStates
 	dst.Status.Conditions = restored.Status.Conditions