Merge pull request kubernetes-sigs#680 from CecileRobertMichon/vmtype-vmss

🐛 MachinePool template must have vmType vmss in control plane azure.json

Author: k8s-ci-robot

docs/topics/machinepools.md

@@ -36,6 +36,8 @@ Cluster API Provider Azure (CAPZ) has experimental support for `MachinePool` tho
 type `AzureMachinePool`. An `AzureMachinePool` corresponds to an [Azure Virtual Machine Scale Set](https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/overview),
 which provides the cloud provider specific resource for orchestrating a group of Virtual Machines.
 
+⚠️ Cloud provider for Azure does not currently support clusters in mixed mode (both vmss and vmas node pools), so it is not supported to have both `AzureMachinePools` and `AzureMachines` in the same workload cluster.
+
 ### Using `clusterctl` to deploy
 To deploy a MachinePool / AzureMachinePool via `clusterctl config` there's a [flavor](https://cluster-api.sigs.k8s.io/clusterctl/commands/config-cluster.html#flavors) 
 for that.
@@ -126,4 +128,4 @@ spec:
         cloud-provider: azure
       name: '{{ ds.meta_data["local_hostname"] }}'
   useExperimentalRetryJoin: true
-```
+```

templates/cluster-template-machinepool.yaml

@@ -74,7 +74,7 @@ spec:
           "resourceGroup": "${AZURE_RESOURCE_GROUP}",
           "securityGroupName": "${CLUSTER_NAME}-node-nsg",
           "location": "${AZURE_LOCATION}",
-          "vmType": "standard",
+          "vmType": "vmss",
           "vnetName": "${CLUSTER_NAME}-vnet",
           "vnetResourceGroup": "${CLUSTER_NAME}",
           "subnetName": "${CLUSTER_NAME}-node-subnet",

templates/flavors/machinepool/kustomization.yaml

@@ -1,4 +1,6 @@
 namespace: default
 resources:
   - ../base
-  - machine-pool-deployment.yaml
+  - machine-pool-deployment.yaml
+patchesStrategicMerge:
+  - patches/control-plane-azure-file.yaml

templates/flavors/machinepool/patches/control-plane-azure-file.yaml

@@ -0,0 +1,33 @@
+---
+apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
+kind: KubeadmControlPlane
+metadata:
+  name: ${CLUSTER_NAME}-control-plane
+  namespace: default
+spec:
+  kubeadmConfigSpec:
+    files:
+    - content: |
+        {
+          "cloud": "AzurePublicCloud",
+          "tenantId": "${AZURE_TENANT_ID}",
+          "subscriptionId": "${AZURE_SUBSCRIPTION_ID}",
+          "aadClientId": "${AZURE_CLIENT_ID}",
+          "aadClientSecret": "${AZURE_CLIENT_SECRET}",
+          "resourceGroup": "${AZURE_RESOURCE_GROUP}",
+          "securityGroupName": "${CLUSTER_NAME}-node-nsg",
+          "location": "${AZURE_LOCATION}",
+          "vmType": "vmss",
+          "vnetName": "${CLUSTER_NAME}-vnet",
+          "vnetResourceGroup": "${CLUSTER_NAME}",
+          "subnetName": "${CLUSTER_NAME}-node-subnet",
+          "routeTableName": "${CLUSTER_NAME}-node-routetable",
+          "userAssignedID": "${CLUSTER_NAME}",
+          "loadBalancerSku": "standard",
+          "maximumLoadBalancerRuleCount": 250,
+          "useManagedIdentityExtension": false,
+          "useInstanceMetadata": true
+        }
+      owner: root:root
+      path: /etc/kubernetes/azure.json
+      permissions: "0644"

templates/test/cluster-template-prow-machine-pool.yaml

@@ -77,7 +77,7 @@ spec:
           "resourceGroup": "${AZURE_RESOURCE_GROUP}",
           "securityGroupName": "${CLUSTER_NAME}-node-nsg",
           "location": "${AZURE_LOCATION}",
-          "vmType": "standard",
+          "vmType": "vmss",
           "vnetName": "${CLUSTER_NAME}-vnet",
           "vnetResourceGroup": "${CLUSTER_NAME}",
           "subnetName": "${CLUSTER_NAME}-node-subnet",