change to zonelength

Azure · Jul 10, 2018 · 79143b1 · 79143b1
1 parent d4757f4
commit 79143b1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 24 deletions.
diff --git a/parts/k8s/kubernetesagentresourcesvmas.t b/parts/k8s/kubernetesagentresourcesvmas.t
@@ -182,7 +182,7 @@
       },
       "location": "[variables('location')]",
       {{if HaveAvailabilityZones .}}
-      "zones": "[split(string(add(mod(copyIndex(),{{GetMaxAvailabilityZone .}}),{{GetMinAvailabilityZone .}})), ',')]",
+      "zones": "[split(string(add(mod(copyIndex(),{{GetAvailabilityZoneLength .}}),{{GetMinAvailabilityZone .}})), ',')]",
       {{ end }}
       "name": "[concat(variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')))]",
       {{if UseManagedIdentity}}

diff --git a/parts/k8s/kubernetesmasterresources.t b/parts/k8s/kubernetesmasterresources.t
@@ -156,9 +156,9 @@
       "properties": {
         "dnsSettings": {
           "domainNameLabel": "[variables('masterFqdnPrefix')]"
-        },
+        }
         {{if HaveMasterAvailabilityZones}}
-        "publicIPAllocationMethod": "Static"
+        ,"publicIPAllocationMethod": "Static"
         {{end}}
       },
       "type": "Microsoft.Network/publicIPAddresses"
@@ -768,7 +768,7 @@
       },
       "location": "[variables('location')]",
       {{ if HaveMasterAvailabilityZones}}
-      "zones": "[split(string(add(mod(copyIndex(),{{GetMasterMaxAvailabilityZone}}),{{GetMasterMinAvailabilityZone}})), ',')]",
+      "zones": "[split(string(add(mod(copyIndex(),{{GetMasterAvailabilityZoneLength}}),{{GetMasterMinAvailabilityZone}})), ',')]",
       {{ end }}
       "name": "[concat(variables('masterVMNamePrefix'), copyIndex(variables('masterOffset')))]",
       {{if UseManagedIdentity}}
@@ -784,11 +784,11 @@
       },
       {{end}}
       "properties": {
-{{if not HaveMasterAvailabilityZones}}
+        {{if not HaveMasterAvailabilityZones}}
         "availabilitySet": {
           "id": "[resourceId('Microsoft.Compute/availabilitySets',variables('masterAvailabilitySet'))]"
         },
-{{end}}
+        {{end}}
         "hardwareProfile": {
           "vmSize": "[variables('masterVMSize')]"
         },

diff --git a/pkg/acsengine/template_generator.go b/pkg/acsengine/template_generator.go
@@ -686,15 +686,8 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat
 			}
 			return min
 		},
-		"GetMaxAvailabilityZone": func(profile *api.AgentPoolProfile) int {
-			max, _ := strconv.Atoi(profile.AvailabilityZones[0])
-			for _, z := range profile.AvailabilityZones {
-				i, _ := strconv.Atoi(z)
-				if max < i {
-					max = i
-				}
-			}
-			return max
+		"GetAvailabilityZoneLength": func(profile *api.AgentPoolProfile) int {
+			return len(profile.AvailabilityZones)
 		},
 		"HaveMasterAvailabilityZones": func() bool {
 			return len(cs.Properties.MasterProfile.AvailabilityZones) > 0
@@ -709,15 +702,8 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat
 			}
 			return min
 		},
-		"GetMasterMaxAvailabilityZone": func() int {
-			max, _ := strconv.Atoi(cs.Properties.MasterProfile.AvailabilityZones[0])
-			for _, z := range cs.Properties.MasterProfile.AvailabilityZones {
-				i, _ := strconv.Atoi(z)
-				if max < i {
-					max = i
-				}
-			}
-			return max
+		"GetMasterAvailabilityZoneLength": func() int {
+			return len(cs.Properties.MasterProfile.AvailabilityZones)
 		},
 		"HasLinuxSecrets": func() bool {
 			return cs.Properties.LinuxProfile.HasSecrets()