Merge pull request #210 from nilo19/t-qini-update_distro

Add distro setting to corresponding aks config files.
kubernetes-sigs · Aug 7, 2019 · 6d79632 · 6d79632
2 parents c17d5d2 + ae9785d
commit 6d79632
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 16 deletions.
diff --git a/examples/aks-engine.json b/examples/aks-engine.json
@@ -23,15 +23,17 @@
         "masterProfile": {
             "count": 1,
             "dnsPrefix": "k8s",
-            "vmSize": "Standard_D2_v3"
+            "vmSize": "Standard_D2_v3",
+            "distro": "aks-ubuntu-16.04"
         },
         "agentPoolProfiles": [
             {
                 "name": "agentpool1",
                 "count": 3,
                 "vmSize": "Standard_D2_v3",
                 "availabilityProfile": "VirtualMachineScaleSets",
-                "storageProfile": "ManagedDisks"
+                "storageProfile": "ManagedDisks",
+                "distro": "aks-ubuntu-16.04"
             }
         ],
         "linuxProfile": {

diff --git a/examples/az.json b/examples/az.json
@@ -27,7 +27,8 @@
             "availabilityZones": [
                 "1",
                 "2"
-            ]
+            ],
+            "distro": "aks-ubuntu-16.04"
         },
         "agentPoolProfiles": [
             {
@@ -39,7 +40,8 @@
                 "availabilityZones": [
                     "1",
                     "2"
-                ]
+                ],
+                "distro": "aks-ubuntu-16.04"
             }
         ],
         "linuxProfile": {

diff --git a/tests/k8s-azure/manifest/linux-autoscaler.json b/tests/k8s-azure/manifest/linux-autoscaler.json
@@ -33,15 +33,17 @@
         "masterProfile": {
             "count": 1,
             "dnsPrefix": "{dnsPrefix}",
-            "vmSize": "Standard_F2"
+            "vmSize": "Standard_F2",
+            "distro": "aks-ubuntu-16.04"
         },
         "agentPoolProfiles": [
             {
                 "name": "agentpool1",
                 "count": 2,
                 "vmSize": "Standard_F2",
                 "availabilityProfile": "VirtualMachineScaleSets",
-                "storageProfile": "ManagedDisks"
+                "storageProfile": "ManagedDisks",
+                "distro": "aks-ubuntu-16.04"
             }
         ],
         "linuxProfile": {

diff --git a/tests/k8s-azure/manifest/linux-kcm.json b/tests/k8s-azure/manifest/linux-kcm.json
@@ -23,7 +23,7 @@
             "count": 1,
             "dnsPrefix": "{dnsPrefix}",
             "vmSize": "Standard_F2",
-            "distro": "ubuntu"
+            "distro": "aks-ubuntu-16.04"
         },
         "agentPoolProfiles": [
             {
@@ -32,7 +32,7 @@
                 "vmSize": "Standard_F2",
                 "availabilityProfile": "VirtualMachineScaleSets",
                 "storageProfile": "ManagedDisks",
-                "distro": "ubuntu"
+                "distro": "aks-ubuntu-16.04"
             }
         ],
         "linuxProfile": {

diff --git a/tests/k8s-azure/manifest/linux-vmss-multi-zones.json b/tests/k8s-azure/manifest/linux-vmss-multi-zones.json
@@ -28,7 +28,8 @@
             "availabilityZones": [
                 "1",
                 "2"
-            ]
+            ],
+            "distro": "aks-ubuntu-16.04"
         },
         "agentPoolProfiles": [
             {
@@ -39,7 +40,8 @@
                 "availabilityZones": [
                     "1",
                     "2"
-                ]
+                ],
+                "distro": "aks-ubuntu-16.04"
             }
         ],
         "linuxProfile": {

diff --git a/tests/k8s-azure/manifest/linux-vmss-serial.json b/tests/k8s-azure/manifest/linux-vmss-serial.json
@@ -23,7 +23,8 @@
         "masterProfile": {
             "count": 1,
             "dnsPrefix": "{dnsPrefix}",
-            "vmSize": "Standard_F2"
+            "vmSize": "Standard_F2",
+            "distro": "aks-ubuntu-16.04"
         },
         "agentPoolProfiles": [
             {
@@ -32,7 +33,8 @@
                 "vmSize": "Standard_F2",
                 "availabilityProfile": "VirtualMachineScaleSets",
                 "storageProfile": "ManagedDisks",
-                "enableVMSSNodePublicIP": true
+                "enableVMSSNodePublicIP": true,
+                "distro": "aks-ubuntu-16.04"
             }
         ],
         "linuxProfile": {

diff --git a/tests/k8s-azure/manifest/linux-vmss.json b/tests/k8s-azure/manifest/linux-vmss.json
@@ -23,15 +23,17 @@
         "masterProfile": {
             "count": 1,
             "dnsPrefix": "{dnsPrefix}",
-            "vmSize": "Standard_F2"
+            "vmSize": "Standard_F2",
+            "distro": "aks-ubuntu-16.04"
         },
         "agentPoolProfiles": [
             {
                 "name": "agentpool1",
                 "count": 2,
                 "vmSize": "Standard_F2",
                 "availabilityProfile": "VirtualMachineScaleSets",
-                "storageProfile": "ManagedDisks"
+                "storageProfile": "ManagedDisks",
+                "distro": "aks-ubuntu-16.04"
             }
         ],
         "linuxProfile": {

diff --git a/tests/k8s-azure/manifest/linux.json b/tests/k8s-azure/manifest/linux.json
@@ -23,15 +23,17 @@
         "masterProfile": {
             "count": 1,
             "dnsPrefix": "{dnsPrefix}",
-            "vmSize": "Standard_F2"
+            "vmSize": "Standard_F2",
+            "distro": "aks-ubuntu-16.04"
         },
         "agentPoolProfiles": [
             {
                 "name": "agentpool1",
                 "count": 2,
                 "vmSize": "Standard_F2",
                 "availabilityProfile": "AvailabilitySet",
-                "storageProfile": "ManagedDisks"
+                "storageProfile": "ManagedDisks",
+                "distro": "aks-ubuntu-16.04"
             }
         ],
         "linuxProfile": {