update

Azure · Jul 9, 2018 · 2916c7a · 2916c7a
1 parent a706805
commit 2916c7a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/parts/k8s/kubernetesagentresourcesvmas.t b/parts/k8s/kubernetesagentresourcesvmas.t
@@ -81,7 +81,7 @@
       "type": "Microsoft.Network/networkInterfaces"
     },
 {{if .IsManagedDisks}}
-{{if not HaveAvailabilityZones}}
+{{if not (HaveAvailabilityZones .)}}
    {
       "location": "[variables('location')]",
       "name": "[variables('{{.Name}}AvailabilitySet')]",
@@ -139,7 +139,7 @@
       "type": "Microsoft.Storage/storageAccounts"
     },
     {{end}}
-{{if not HaveAvailabilityZones}}
+{{if not (HaveAvailabilityZones .)}}
     {
       "location": "[variables('location')]",
       "name": "[variables('{{.Name}}AvailabilitySet')]",
@@ -168,7 +168,7 @@
   {{end}}
 {{end}}
         "[concat('Microsoft.Network/networkInterfaces/', variables('{{.Name}}VMNamePrefix'), 'nic-', copyIndex(variables('{{.Name}}Offset')))]",
-        {{if not HaveAvailabilityZones}}
+        {{if not (HaveAvailabilityZones .)}}
         "[concat('Microsoft.Compute/availabilitySets/', variables('{{.Name}}AvailabilitySet'))]"
         {{end}}
       ],
@@ -181,7 +181,7 @@
         "poolName" : "{{.Name}}"
       },
       "location": "[variables('location')]",
-      {{if HaveAvailabilityZones}}
+      {{if HaveAvailabilityZones .}}
       "zones": "[split(string(add(mod(copyIndex(),{{GetMaxAvailabilityZone .}}),{{GetMinAvailabilityZone .}})), ',')]",
       {{ end }}
       "name": "[concat(variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')))]",
@@ -198,7 +198,7 @@
       },
       {{end}}
       "properties": {
-        {{if not HaveAvailabilityZones}}
+        {{if not (HaveAvailabilityZones .)}}
         "availabilitySet": {
           "id": "[resourceId('Microsoft.Compute/availabilitySets',variables('{{.Name}}AvailabilitySet'))]"
         },

diff --git a/parts/k8s/kubernetesmasterresources.t b/parts/k8s/kubernetesmasterresources.t
@@ -148,21 +148,33 @@
       "apiVersion": "[variables('apiVersionNetwork')]",
       "location": "[variables('location')]",
       "name": "[variables('masterPublicIPAddressName')]",
+      {{if HaveMasterAvailabilityZones}}
+      "sku": {
+          "name": "Standard"
+      },
+      {{end}}
       "properties": {
         "dnsSettings": {
           "domainNameLabel": "[variables('masterFqdnPrefix')]"
         },
-        "publicIPAllocationMethod": "Dynamic"
+        {{if HaveMasterAvailabilityZones}}
+        "publicIPAllocationMethod": "Static"
+        {{end}}
       },
       "type": "Microsoft.Network/publicIPAddresses"
     },
     {
-      "apiVersion": "[variables('apiVersionDefault')]",
+      "apiVersion": "[variables('apiVersionNetwork')]",
       "dependsOn": [
         "[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
       ],
       "location": "[variables('location')]",
       "name": "[variables('masterLbName')]",
+      {{if HaveMasterAvailabilityZones}}
+      "sku": {
+          "name": "Standard"
+      },
+      {{end}}
       "properties": {
         "backendAddressPools": [
           {
@@ -514,9 +526,11 @@
     },
     {
       "type": "Microsoft.Network/publicIpAddresses",
+      {{if HaveMasterAvailabilityZones}}
       "sku": {
-          "name": "Basic"
+          "name": "Standard"
       },
+      {{end}}
       "name": "[variables('jumpboxPublicIpAddressName')]",
       "apiVersion": "[variables('apiVersionPublicIP')]",
       "location": "[variables('location')]",