msazurestackworkloads · deaborch · Jul 23, 2019 · Jul 29, 2019 · Jul 30, 2019 · Aug 8, 2019
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+**/.DS_Store
+**/_out
+go.mod
diff --git a/.pipeline/assets/encoding/dvm_cloud_init.t b/.pipeline/assets/encoding/dvm_cloud_init.t
diff --git a/.pipeline/assets/encoding/encode_cse_script.ps1 b/.pipeline/assets/encoding/encode_cse_script.ps1
diff --git a/.pipeline/assets/encoding/encode_cse_script.sh b/.pipeline/assets/encoding/encode_cse_script.sh
diff --git a/AKSEngine-E2E/AksTest-Scripts/aksEngineScale.sh b/AKSEngine-E2E/AksTest-Scripts/aksEngineScale.sh
@@ -1,4 +1,5 @@
-#! /bin/bash
+#!/bin/bash -x
+
 set -e
 
 log_level()

diff --git a/AKSEngine-E2E/AksTest-Scripts/aksEngineUpgrade.sh b/AKSEngine-E2E/AksTest-Scripts/aksEngineUpgrade.sh
@@ -1,4 +1,5 @@
-#! /bin/bash
+#!/bin/bash -x
+
 set -e
 
 log_level()

diff --git a/AKSEngine-E2E/AksTest-Scripts/runAksScript.sh b/AKSEngine-E2E/AksTest-Scripts/runAksScript.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 function printUsage
 {

diff --git a/AKSEngine-E2E/Template/MainTemplate.json b/AKSEngine-E2E/Template/MainTemplate.json
@@ -166,7 +166,12 @@
     },
     "kubernetesAzureCloudProviderVersion": {
       "type": "string",
-      "defaultValue": "1.11",
+      "metadata": {
+        "description": "This is the version for the Kubernetes Azure cloud provider. We would use a custom Kubernetes build specifically for Azure Stack for each version."
+      }
+    },
+    "kubernetesAzureCloudProviderRelease": {
+      "type": "string",
       "metadata": {
         "description": "This is the version for the Kubernetes Azure cloud provider. We would use a custom Kubernetes build specifically for Azure Stack for each version."
       }
@@ -183,10 +188,10 @@
     "resourceGroupName": "[resourceGroup().name]",
     "dnsNameForPublicIP": "[toLower(concat('vmd-dns', parameters('masterProfileDnsPrefix')))]",
     "location": "[resourceGroup().location]",
-    "imagePublisher": "Canonical",
-    "imageOffer": "UbuntuServer",
-    "imageSku": "16.04-LTS",
-    "imageVersion": "latest",
+    "imagePublisher": "microsoft-aks",
+    "imageOffer": "aks",
+    "imageSku": "aks-engine-ubuntu-1604-202003",
+    "imageVersion": "2020.03.19",
     "vmSize": "Standard_D2_v2",
     "OSDiskName": "osdisk",
     "nicName": "[concat('vmd-vnic', uniqueString(resourceGroup().id))]",
@@ -254,6 +259,9 @@
           "kubernetesAzureCloudProviderVersion": {
             "value": "[parameters('kubernetesAzureCloudProviderVersion')]"
           },
+          "kubernetesAzureCloudProviderRelease": {
+            "value": "[parameters('kubernetesAzureCloudProviderRelease')]"
+          },
           "identitySystem": {
             "value": "[parameters('identitySystem')]"
           },

diff --git a/AKSEngine-E2E/Template/azuredeploy.json b/AKSEngine-E2E/Template/azuredeploy.json
diff --git a/AKSEngine-E2E/Template/azuredeploy.parameters.json b/AKSEngine-E2E/Template/azuredeploy.parameters.json
@@ -35,6 +35,9 @@
     "kubernetesAzureCloudProviderVersion": {
       "value": ""
     },
+    "kubernetesAzureCloudProviderRelease": {
+      "value": ""
+    },
     "identitySystem": {
       "value": ""
     },

diff --git a/AKSEngine-E2E/Template/azurestack_template.json b/AKSEngine-E2E/Template/azurestack_template.json
@@ -4,20 +4,39 @@
     "properties": {
         "orchestratorProfile": {
             "orchestratorType": "Kubernetes",
-            "orchestratorRelease": "1.11",
+            "orchestratorRelease": "",
+            "orchestratorVersion": "",
             "kubernetesConfig": {
+                "cloudProviderBackoff": true,
+                "cloudProviderBackoffRetries": 1,
+                "cloudProviderBackoffDuration": 30,
+                "cloudProviderRateLimit": true,
+                "cloudProviderRateLimitQPS": 3,
+                "cloudProviderRateLimitBucket": 10,
+                "cloudProviderRateLimitQPSWrite": 3,
+                "cloudProviderRateLimitBucketWrite": 10,
                 "kubernetesImageBase": "mcr.microsoft.com/k8s/azurestack/core/",
                 "useInstanceMetadata": false,
-                "networkPlugin": "flannel",
+                "networkPlugin": "kubenet",
+                "kubeletConfig": {
+                    "--node-status-update-frequency": "1m"
+                },
+                "controllerManagerConfig": {
+                    "--node-monitor-grace-period": "5m",
+                    "--pod-eviction-timeout": "5m",
+                    "--route-reconciliation-period": "1m"
+                },
                 "customWindowsPackageURL": ""
             }
         },
         "customCloudProfile": {
-            "portalURL": ""
+            "identitySystem": "",
+            "portalURL": "",
+            "authenticationMethod": ""
         },
         "masterProfile": {
             "dnsPrefix": "",
-            "distro": "ubuntu",
+            "distro": "aks-ubuntu-16.04",
             "osDiskSizeGB": 100,
             "availabilityProfile": "AvailabilitySet",
             "count": 3,