rm zones from master and vmas, add setVMSSDefaults, set default for z…

…ones
Azure · Aug 16, 2018 · 3804e7e · 3804e7e
1 parent 5f673f1
commit 3804e7e
Show file tree

Hide file tree

Showing 18 changed files with 60 additions and 96 deletions.
diff --git a/parts/agentparams.t b/parts/agentparams.t
@@ -50,7 +50,7 @@
       },
       "type": "string"
     },
-{{if HaveAvailabilityZones .}}
+{{if HasAvailabilityZones .}}
     "{{.Name}}AvailabilityZones": {
       "metadata": {
         "description": "Agent availability zones"

diff --git a/parts/k8s/kubernetesagentresourcesvmas.t b/parts/k8s/kubernetesagentresourcesvmas.t
@@ -81,7 +81,6 @@
       "type": "Microsoft.Network/networkInterfaces"
     },
 {{if .IsManagedDisks}}
-{{if not (HaveAvailabilityZones .)}}
    {
       "location": "[variables('location')]",
       "name": "[variables('{{.Name}}AvailabilitySet')]",
@@ -95,7 +94,6 @@
 
       "type": "Microsoft.Compute/availabilitySets"
     },
-{{end}}
 {{else if .IsStorageAccount}}
     {
       "apiVersion": "[variables('apiVersionStorage')]",
@@ -139,15 +137,13 @@
       "type": "Microsoft.Storage/storageAccounts"
     },
     {{end}}
-{{if not (HaveAvailabilityZones .)}}
     {
       "location": "[variables('location')]",
       "name": "[variables('{{.Name}}AvailabilitySet')]",
       "apiVersion": "[variables('apiVersionDefault')]",
       "properties": {},
       "type": "Microsoft.Compute/availabilitySets"
     },
-{{end}}
 {{end}}
   {
     {{if .IsManagedDisks}}
@@ -168,9 +164,7 @@
   {{end}}
 {{end}}
         "[concat('Microsoft.Network/networkInterfaces/', variables('{{.Name}}VMNamePrefix'), 'nic-', copyIndex(variables('{{.Name}}Offset')))]",
-        {{if not (HaveAvailabilityZones .)}}
         "[concat('Microsoft.Compute/availabilitySets/', variables('{{.Name}}AvailabilitySet'))]"
-        {{end}}
       ],
       "tags":
       {
@@ -181,9 +175,6 @@
         "poolName" : "{{.Name}}"
       },
       "location": "[variables('location')]",
-      {{if HaveAvailabilityZones .}}
-      "zones": "[split(string(add(mod(copyIndex(),{{GetAvailabilityZoneLength .}}),{{GetMinAvailabilityZone .}})), ',')]",
-      {{ end }}
       "name": "[concat(variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')))]",
       {{if UseManagedIdentity}}
       "identity": {
@@ -198,11 +189,9 @@
       },
       {{end}}
       "properties": {
-        {{if not (HaveAvailabilityZones .)}}
         "availabilitySet": {
           "id": "[resourceId('Microsoft.Compute/availabilitySets',variables('{{.Name}}AvailabilitySet'))]"
         },
-        {{end}}
         "hardwareProfile": {
           "vmSize": "[variables('{{.Name}}VMSize')]"
         },

diff --git a/parts/k8s/kubernetesagentresourcesvmss.t b/parts/k8s/kubernetesagentresourcesvmss.t
@@ -26,8 +26,8 @@
       "poolName" : "{{.Name}}"
     },
     "location": "[variables('location')]",
-    {{ if HaveAvailabilityZones .}}
-    "zones": "[variables('{{.Name}}AvailabilityZones')]",
+    {{ if HasAvailabilityZones .}}
+    "zones": "[parameters('{{.Name}}AvailabilityZones')]",
     {{ end }}
     "name": "[variables('{{.Name}}VMNamePrefix')]",
     {{if UseManagedIdentity}}
@@ -41,7 +41,9 @@
       "name": "[variables('{{.Name}}VMSize')]"
     },
     "properties": {
-      {{if not (UseSinglePlacementGroup .)}}
+      {{if UseSinglePlacementGroup .}}
+      "singlePlacementGroup": true,
+      {{else}}
       "singlePlacementGroup": false,
       {{end}}
       "overprovision": false,

diff --git a/parts/k8s/kubernetesagentvars.t b/parts/k8s/kubernetesagentvars.t
@@ -20,9 +20,6 @@
     "{{.Name}}ScaleSetEvictionPolicy": "[parameters('{{.Name}}ScaleSetEvictionPolicy')]",
     {{end}}
 {{end}}
-{{ if HaveAvailabilityZones .}}
-    "{{.Name}}AvailabilityZones": "[parameters('{{.Name}}AvailabilityZones')]",
-{{end}}
 {{end}}
     "{{.Name}}VMSize": "[parameters('{{.Name}}VMSize')]",
 {{if .IsCustomVNET}}

diff --git a/parts/k8s/kubernetescustomscript.sh b/parts/k8s/kubernetescustomscript.sh
@@ -108,6 +108,7 @@ if [[ ! -z "${MASTER_NODE}" ]]; then
     writeKubeConfig
     ensureEtcd
     ensureK8sControlPlane
+    ensureKubelet
 fi
 
 if [[ $OS == $UBUNTU_OS_NAME ]]; then

diff --git a/parts/k8s/kubernetesmasterresources.t b/parts/k8s/kubernetesmasterresources.t
@@ -1,4 +1,3 @@
-{{if not HaveMasterAvailabilityZones}}
 {{if .MasterProfile.IsManagedDisks}}
     {
       "apiVersion": "[variables('apiVersionStorageManagedDisks')]",
@@ -12,17 +11,14 @@
         },
       "type": "Microsoft.Compute/availabilitySets"
     },
-{{end}}
 {{else if .MasterProfile.IsStorageAccount}}
-{{if not HaveMasterAvailabilityZones}}
     {
       "apiVersion": "[variables('apiVersionDefault')]",
       "location": "[variables('location')]",
       "name": "[variables('masterAvailabilitySet')]",
       "properties": {},
       "type": "Microsoft.Compute/availabilitySets"
     },
-{{end}}
     {
       "apiVersion": "[variables('apiVersionStorage')]",
 {{if not IsPrivateCluster}}
@@ -145,36 +141,24 @@
 {{end}}
 {{if not IsPrivateCluster}}
     {
-      "apiVersion": "[variables('apiVersionNetwork')]",
+      "apiVersion": "[variables('apiVersionDefault')]",
       "location": "[variables('location')]",
       "name": "[variables('masterPublicIPAddressName')]",
-      {{if HaveMasterAvailabilityZones}}
-      "sku": {
-          "name": "Standard"
-      },
-      {{end}}
       "properties": {
         "dnsSettings": {
           "domainNameLabel": "[variables('masterFqdnPrefix')]"
-        }
-        {{if HaveMasterAvailabilityZones}}
-        ,"publicIPAllocationMethod": "Static"
-        {{end}}
+        },
+        "publicIPAllocationMethod": "Dynamic"
       },
       "type": "Microsoft.Network/publicIPAddresses"
     },
     {
-      "apiVersion": "[variables('apiVersionNetwork')]",
+      "apiVersion": "[variables('apiVersionDefault')]",
       "dependsOn": [
         "[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
       ],
       "location": "[variables('location')]",
       "name": "[variables('masterLbName')]",
-      {{if HaveMasterAvailabilityZones}}
-      "sku": {
-          "name": "Standard"
-      },
-      {{end}}
       "properties": {
         "backendAddressPools": [
           {
@@ -526,13 +510,11 @@
     },
     {
       "type": "Microsoft.Network/publicIpAddresses",
-      {{if HaveMasterAvailabilityZones}}
       "sku": {
-          "name": "Standard"
+          "name": "Basic"
       },
-      {{end}}
       "name": "[variables('jumpboxPublicIpAddressName')]",
-      "apiVersion": "[variables('apiVersionPublicIP')]",
+      "apiVersion": "[variables('apiVersionDefault')]",
       "location": "[variables('location')]",
       "properties": {
           "dnsSettings": {
@@ -578,7 +560,7 @@
 {{end}}
 {{if gt .MasterProfile.Count 1}}
     {
-      "apiVersion": "[variables('apiVersionNetwork')]",
+      "apiVersion": "[variables('apiVersionDefault')]",
       "dependsOn": [
 {{if .MasterProfile.IsCustomVNET}}
         "[variables('nsgID')]"
@@ -588,11 +570,6 @@
       ],
       "location": "[variables('location')]",
       "name": "[variables('masterInternalLbName')]",
-      {{if HaveMasterAvailabilityZones}}
-      "sku": {
-          "name": "Standard"
-      },
-      {{end}}
       "properties": {
         "backendAddressPools": [
           {
@@ -663,7 +640,7 @@
        "apiVersion": "[variables('apiVersionKeyVault')]",
        "location": "[variables('location')]",
        {{ if UseManagedIdentity}}
-       "dependsOn":
+       "dependsOn": 
        [
           {{$max := .MasterProfile.Count}}
           {{$c := subtract $max 1}}
@@ -696,7 +673,7 @@
            }
          ],
  {{else}}
-         "accessPolicies":
+         "accessPolicies": 
          [
           {{$max := .MasterProfile.Count}}
           {{$c := subtract $max 1}}
@@ -754,9 +731,7 @@
       },
       "dependsOn": [
         "[concat('Microsoft.Network/networkInterfaces/', variables('masterVMNamePrefix'), 'nic-', copyIndex(variables('masterOffset')))]"
-{{if not HaveMasterAvailabilityZones}}
         ,"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]"
-{{end}}
 {{if .MasterProfile.IsStorageAccount}}
         ,"[variables('masterStorageAccountName')]"
 {{end}}
@@ -770,9 +745,6 @@
         "poolName" : "master"
       },
       "location": "[variables('location')]",
-      {{ if HaveMasterAvailabilityZones}}
-      "zones": "[split(string(add(mod(copyIndex(),{{GetMasterAvailabilityZoneLength}}),{{GetMasterMinAvailabilityZone}})), ',')]",
-      {{ end }}
       "name": "[concat(variables('masterVMNamePrefix'), copyIndex(variables('masterOffset')))]",
       {{if UseManagedIdentity}}
       "identity": {
@@ -787,11 +759,9 @@
       },
       {{end}}
       "properties": {
-        {{if not HaveMasterAvailabilityZones}}
         "availabilitySet": {
           "id": "[resourceId('Microsoft.Compute/availabilitySets',variables('masterAvailabilitySet'))]"
         },
-        {{end}}
         "hardwareProfile": {
           "vmSize": "[parameters('masterVMSize')]"
         },
@@ -961,4 +931,4 @@
       }
     }
     {{end}}
-    {{WriteLinkedTemplatesForExtensions}}
+    {{WriteLinkedTemplatesForExtensions}}
diff --git a/parts/k8s/kubernetesmastervars.t b/parts/k8s/kubernetesmastervars.t
@@ -83,7 +83,6 @@
 {{end}}
     "apiVersionDefault": "2016-03-30",
     "apiVersionLinkDefault": "2015-01-01",
-    "apiVersionNetwork": "2018-05-01",
     "locations": [
          "[resourceGroup().location]",
          "[parameters('location')]"

diff --git a/parts/k8s/kuberneteswinagentresourcesvmas.t b/parts/k8s/kuberneteswinagentresourcesvmas.t
@@ -29,9 +29,6 @@
 {{end}}
       ],
       "location": "[variables('location')]",
-      {{ if HaveAvailabilityZones .}}
-      "zones": "[variables('{{.Name}}AvailabilityZones')]",
-      {{ end }}
       "name": "[concat(variables('{{.Name}}VMNamePrefix'), 'nic-', copyIndex(variables('{{.Name}}Offset')))]",
       "properties": {
 {{if .IsCustomVNET}}

diff --git a/parts/k8s/kuberneteswinagentresourcesvmss.t b/parts/k8s/kuberneteswinagentresourcesvmss.t
@@ -26,8 +26,8 @@
       "poolName" : "{{.Name}}"
     },
     "location": "[variables('location')]",
-    {{ if HaveAvailabilityZones .}}
-    "zones": "[variables('{{.Name}}AvailabilityZones')]",
+    {{ if HasAvailabilityZones .}}
+    "zones": "[parameters('{{.Name}}AvailabilityZones')]",
     {{ end }}
     "name": "[variables('{{.Name}}VMNamePrefix')]",
     {{if UseManagedIdentity}}
@@ -41,6 +41,11 @@
       "name": "[variables('{{.Name}}VMSize')]"
     },
     "properties": {
+      {{if UseSinglePlacementGroup .}}
+      "singlePlacementGroup": true,
+      {{else}}
+      "singlePlacementGroup": false,
+      {{end}}
       "overprovision": false,
       "upgradePolicy": {
         "mode": "Manual"

diff --git a/parts/masterparams.t b/parts/masterparams.t
@@ -72,14 +72,6 @@
       },
       "type": "string"
     },
-{{end}}
-{{if HaveMasterAvailabilityZones}}
-    "masterAvailabilityZones": {
-      "metadata": {
-        "description": "Master availability zones"
-      },
-      "type": "array"
-    },
 {{end}}
     "sshRSAPublicKey": {
       "metadata": {

diff --git a/pkg/acsengine/defaults.go b/pkg/acsengine/defaults.go
@@ -232,6 +232,7 @@ func setPropertiesDefaults(cs *api.ContainerService, isUpgrade, isScale bool) (b
 
 	setStorageDefaults(properties)
 	setExtensionDefaults(properties)
+	setVMSSDefaults(properties)
 
 	certsGenerated, e := setDefaultCerts(properties)
 	if e != nil {
@@ -546,6 +547,33 @@ func setMasterNetworkDefaults(a *api.Properties, isUpgrade bool) {
 	}
 }
 
+// setVMSSDefaults
+// singlePlacementGroup = false, the scale set can be composed of multiple placement groups and has a range of 0-1,000 VMs
+// singlePlacementGroup = true,, default value, a scale set is composed of a single placement group, and has a range of 0-100 VMs
+// Large scale sets require Azure Managed Disks.
+// https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-placement-groups
+// For availability zones, only standard load balancer is supported.
+func setVMSSDefaults(a *api.Properties) {
+	for _, profile := range a.AgentPoolProfiles {
+		if profile.AvailabilityProfile == api.VirtualMachineScaleSets {
+			if profile.Count > 100 {
+				profile.SinglePlacementGroup = helpers.PointerToBool(false)
+			}
+			if profile.SinglePlacementGroup == helpers.PointerToBool(false) {
+				profile.StorageProfile = api.ManagedDisks
+			}
+			if len(profile.AvailabilityZones) > 0 {
+				a.OrchestratorProfile.KubernetesConfig.LoadBalancerSku = "Standard"
+				a.OrchestratorProfile.KubernetesConfig.ExcludeMasterFromStandardLB = helpers.PointerToBool(api.DefaultExcludeMasterFromStandardLB)
+			}
+			if profile.SinglePlacementGroup == nil {
+				profile.SinglePlacementGroup = helpers.PointerToBool(api.DefaultSinglePlacementGroup)
+			}
+		}
+
+	}
+}
+
 // SetAgentNetworkDefaults for agents
 func setAgentNetworkDefaults(a *api.Properties, isUpgrade, isScale bool) {
 	// configure the subnets if not in custom VNET