Make AvailabilitySet profile for master use Availability Zones (#4286)

Azure · Nov 28, 2018 · 7df12dd · 7df12dd
1 parent 09aba18
commit 7df12dd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 25 deletions.
diff --git a/parts/k8s/kubernetesmasterresources.t b/parts/k8s/kubernetesmasterresources.t
@@ -1,4 +1,5 @@
 {{if .MasterProfile.IsManagedDisks}}
+    {{if not .MasterProfile.HasAvailabilityZones}}
     {
       "apiVersion": "[variables('apiVersionCompute')]",
       "location": "[variables('location')]",
@@ -13,14 +14,17 @@
       },
       "type": "Microsoft.Compute/availabilitySets"
     },
+    {{end}}
 {{else if .MasterProfile.IsStorageAccount}}
+    {{if not .MasterProfile.HasAvailabilityZones}}
     {
       "apiVersion": "[variables('apiVersionCompute')]",
       "location": "[variables('location')]",
       "name": "[variables('masterAvailabilitySet')]",
       "properties": {},
       "type": "Microsoft.Compute/availabilitySets"
     },
+    {{end}}
     {
       "apiVersion": "[variables('apiVersionStorage')]",
 {{if not IsPrivateCluster}}
@@ -180,7 +184,10 @@
         "dnsSettings": {
           "domainNameLabel": "[variables('masterFqdnPrefix')]"
         },
-        "publicIPAllocationMethod": "Dynamic"
+        "publicIPAllocationMethod": "Static"
+      },
+      "sku": {
+        "name": "[variables('loadBalancerSku')]"
       },
       "type": "Microsoft.Network/publicIPAddresses"
     },
@@ -241,6 +248,9 @@
           }
         ]
       },
+      "sku": {
+        "name": "[variables('loadBalancerSku')]"
+      },
       "type": "Microsoft.Network/loadBalancers"
     },
     {
@@ -649,6 +659,9 @@
           }
         ]
       },
+      "sku": {
+        "name": "[variables('loadBalancerSku')]"
+      },
       "type": "Microsoft.Network/loadBalancers"
     },
 {{end}}
@@ -696,7 +709,7 @@
          "tenantId": "[variables('tenantID')]",
  {{if UseManagedIdentity}}
     {{if UserAssignedIDEnabled}}
-        "accessPolicies": 
+        "accessPolicies":
         [
           {
             "tenantId": "[variables('tenantID')]",
@@ -772,7 +785,9 @@
       },
       "dependsOn": [
         "[concat('Microsoft.Network/networkInterfaces/', variables('masterVMNamePrefix'), 'nic-', copyIndex(variables('masterOffset')))]"
+        {{if not .MasterProfile.HasAvailabilityZones}}
         ,"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]"
+        {{end}}
 {{if .MasterProfile.IsStorageAccount}}
         ,"[variables('masterStorageAccountName')]"
 {{end}}
@@ -787,6 +802,9 @@
       },
       "location": "[variables('location')]",
       "name": "[concat(variables('masterVMNamePrefix'), copyIndex(variables('masterOffset')))]",
+      {{if .MasterProfile.HasAvailabilityZones}}
+      "zones": "[split(string(parameters('availabilityZones')[mod(copyIndex(variables('masterOffset')), length(parameters('availabilityZones')))]), ',')]",
+      {{end}}
       {{if UseManagedIdentity}}
       {{if UserAssignedIDEnabled}}
       "identity": {
@@ -809,9 +827,11 @@
       },
       {{end}}
       "properties": {
+        {{if not .MasterProfile.HasAvailabilityZones}}
         "availabilitySet": {
           "id": "[resourceId('Microsoft.Compute/availabilitySets',variables('masterAvailabilitySet'))]"
         },
+        {{end}}
         "hardwareProfile": {
           "vmSize": "[parameters('masterVMSize')]"
         },

diff --git a/pkg/api/vlabs/validate.go b/pkg/api/vlabs/validate.go
@@ -491,9 +491,6 @@ func (a *Properties) validateZones() error {
 		if a.HasAvailabilityZones() {
 			if a.MastersAndAgentsUseAvailabilityZones() {
 				// master profile
-				if a.MasterProfile.AvailabilityProfile != VirtualMachineScaleSets {
-					return errors.New("Availability Zones are not supported with an AvailabilitySet. Please set availabilityProfile to VirtualMachineScaleSets")
-				}
 				if a.MasterProfile.Count < len(a.MasterProfile.AvailabilityZones)*2 {
 					return errors.New("the node count and the number of availability zones provided can result in zone imbalance. To achieve zone balance, each zone should have at least 2 nodes or more")
 				}

diff --git a/pkg/api/vlabs/validate_test.go b/pkg/api/vlabs/validate_test.go
@@ -1739,26 +1739,6 @@ func TestProperties_ValidateZones(t *testing.T) {
 			},
 			expectedErr: "availabilityZone is only available in Kubernetes version 1.12 or greater",
 		},
-		{
-			name:                "Master profile with zones vmas",
-			orchestratorRelease: "1.12",
-			masterProfile: &MasterProfile{
-				Count:             3,
-				DNSPrefix:         "foo",
-				VMSize:            "Standard_DS2_v2",
-				AvailabilityZones: []string{"1", "2"},
-			},
-			agentProfiles: []*AgentPoolProfile{
-				{
-					Name:                "agentpool",
-					VMSize:              "Standard_DS2_v2",
-					Count:               4,
-					AvailabilityProfile: VirtualMachineScaleSets,
-					AvailabilityZones:   []string{"1", "2"},
-				},
-			},
-			expectedErr: "Availability Zones are not supported with an AvailabilitySet. Please set availabilityProfile to VirtualMachineScaleSets",
-		},
 		{
 			name:                "Master profile with zones node count",
 			orchestratorRelease: "1.12",