enabled backoff on agents (#988)

- moved provision.sh variables ordinality around to accommodate agent usage
- added backoff vars to agent resources template
- re-ordered backoff vars in master resources template to accommodate changes

parts/kubernetesagentresourcesvmas.t

@@ -208,7 +208,7 @@
         "autoUpgradeMinorVersion": true,
         "settings": {},
         "protectedSettings": {
-          "commandToExecute": "[concat('/usr/bin/nohup /bin/bash -c \"/bin/bash /opt/azure/containers/provision.sh ',variables('tenantID'),' ',variables('subscriptionId'),' ',variables('resourceGroup'),' ',variables('location'),' ',variables('subnetName'),' ',variables('nsgName'),' ',variables('virtualNetworkName'),' ',variables('routeTableName'),' ',variables('primaryAvailablitySetName'),' ',variables('servicePrincipalClientId'),' ',variables('servicePrincipalClientSecret'),' ',variables('clientPrivateKey'),' ',variables('targetEnvironment'),' ',variables('networkPolicy'),' >> /var/log/azure/cluster-provision.log 2>&1 &\" &')]"
+          "commandToExecute": "[concat('/usr/bin/nohup /bin/bash -c \"/bin/bash /opt/azure/containers/provision.sh ',variables('tenantID'),' ',variables('subscriptionId'),' ',variables('resourceGroup'),' ',variables('location'),' ',variables('subnetName'),' ',variables('nsgName'),' ',variables('virtualNetworkName'),' ',variables('routeTableName'),' ',variables('primaryAvailablitySetName'),' ',variables('servicePrincipalClientId'),' ',variables('servicePrincipalClientSecret'),' ',variables('clientPrivateKey'),' ',variables('targetEnvironment'),' ',variables('networkPolicy'),' ',variables('cloudProviderBackoff'),' ',variables('cloudProviderBackoffRetries'),' ',variables('cloudProviderBackoffExponent'),' ',variables('cloudProviderBackoffDuration'),' ',variables('cloudProviderBackoffJitter'),' ',variables('cloudProviderRatelimit'),' ',variables('cloudProviderRatelimitQPS'),' ',variables('cloudProviderRatelimitBucket'),' >> /var/log/azure/cluster-provision.log 2>&1 &\" &')]"
         }
       }
     }

parts/kubernetesmastercustomscript.sh

@@ -20,25 +20,25 @@ KUBELET_PRIVATE_KEY="${12}"
 TARGET_ENVIRONMENT="${13}"
 NETWORK_POLICY="${14}"
 
-# Master only secrets
-APISERVER_PRIVATE_KEY="${15}"
-CA_CERTIFICATE="${16}"
-CA_PRIVATE_KEY="${17}"
-MASTER_FQDN="${18}"
-KUBECONFIG_CERTIFICATE="${19}"
-KUBECONFIG_KEY="${20}"
-ADMINUSER="${21}"
-
 # Default values for backoff configuration
-CLOUDPROVIDER_BACKOFF="${22}"
-CLOUDPROVIDER_BACKOFF_RETRIES="${23}"
-CLOUDPROVIDER_BACKOFF_EXPONENT="${24}"
-CLOUDPROVIDER_BACKOFF_DURATION="${25}"
-CLOUDPROVIDER_BACKOFF_JITTER="${26}"
+CLOUDPROVIDER_BACKOFF="${15}"
+CLOUDPROVIDER_BACKOFF_RETRIES="${16}"
+CLOUDPROVIDER_BACKOFF_EXPONENT="${17}"
+CLOUDPROVIDER_BACKOFF_DURATION="${18}"
+CLOUDPROVIDER_BACKOFF_JITTER="${19}"
 # Default values for rate limit configuration
-CLOUDPROVIDER_RATELIMIT="${27}"
-CLOUDPROVIDER_RATELIMIT_QPS="${28}"
-CLOUDPROVIDER_RATELIMIT_BUCKET="${29}"
+CLOUDPROVIDER_RATELIMIT="${20}"
+CLOUDPROVIDER_RATELIMIT_QPS="${21}"
+CLOUDPROVIDER_RATELIMIT_BUCKET="${22}"
+
+# Master only secrets
+APISERVER_PRIVATE_KEY="${23}"
+CA_CERTIFICATE="${24}"
+CA_PRIVATE_KEY="${25}"
+MASTER_FQDN="${26}"
+KUBECONFIG_CERTIFICATE="${27}"
+KUBECONFIG_KEY="${28}"
+ADMINUSER="${29}"
 
 # cloudinit runcmd and the extension will run in parallel, this is to ensure
 # runcmd finishes

parts/kubernetesmasterresources.t

@@ -481,7 +481,7 @@
         "autoUpgradeMinorVersion": true,
         "settings": {},
         "protectedSettings": {
-          "commandToExecute": "[concat('/usr/bin/nohup /bin/bash -c \"/bin/bash /opt/azure/containers/provision.sh ',variables('tenantID'),' ',variables('subscriptionId'),' ',variables('resourceGroup'),' ',variables('location'),' ',variables('subnetName'),' ',variables('nsgName'),' ',variables('virtualNetworkName'),' ',variables('routeTableName'),' ',variables('primaryAvailablitySetName'),' ',variables('servicePrincipalClientId'),' ',variables('servicePrincipalClientSecret'),' ',variables('clientPrivateKey'),' ',variables('targetEnvironment'),' ',variables('networkPolicy'),' ',variables('apiServerPrivateKey'),' ',variables('caCertificate'),' ',variables('caPrivateKey'),' ',variables('masterFqdnPrefix'),' ',variables('kubeConfigCertificate'),' ',variables('kubeConfigPrivateKey'),' ',variables('username'),' ',variables('cloudProviderBackoff'),' ',variables('cloudProviderBackoffRetries'),' ',variables('cloudProviderBackoffExponent'),' ',variables('cloudProviderBackoffDuration'),' ',variables('cloudProviderBackoffJitter'),' ',variables('cloudProviderRatelimit'),' ',variables('cloudProviderRatelimitQPS'),' ',variables('cloudProviderRatelimitBucket'),' >> /var/log/azure/cluster-provision.log 2>&1\"')]"
+          "commandToExecute": "[concat('/usr/bin/nohup /bin/bash -c \"/bin/bash /opt/azure/containers/provision.sh ',variables('tenantID'),' ',variables('subscriptionId'),' ',variables('resourceGroup'),' ',variables('location'),' ',variables('subnetName'),' ',variables('nsgName'),' ',variables('virtualNetworkName'),' ',variables('routeTableName'),' ',variables('primaryAvailablitySetName'),' ',variables('servicePrincipalClientId'),' ',variables('servicePrincipalClientSecret'),' ',variables('clientPrivateKey'),' ',variables('targetEnvironment'),' ',variables('networkPolicy'),' ',variables('cloudProviderBackoff'),' ',variables('cloudProviderBackoffRetries'),' ',variables('cloudProviderBackoffExponent'),' ',variables('cloudProviderBackoffDuration'),' ',variables('cloudProviderBackoffJitter'),' ',variables('cloudProviderRatelimit'),' ',variables('cloudProviderRatelimitQPS'),' ',variables('cloudProviderRatelimitBucket'),' ',variables('apiServerPrivateKey'),' ',variables('caCertificate'),' ',variables('caPrivateKey'),' ',variables('masterFqdnPrefix'),' ',variables('kubeConfigCertificate'),' ',variables('kubeConfigPrivateKey'),' ',variables('username'),' >> /var/log/azure/cluster-provision.log 2>&1\"')]"
         }
       }
     }