From ae9785d12295be661d3bf6fc4824ce11c4743af3 Mon Sep 17 00:00:00 2001 From: t-qini Date: Wed, 7 Aug 2019 10:23:05 +0800 Subject: [PATCH] Add distro setting to corresponding aks config files. --- examples/aks-engine.json | 6 ++++-- examples/az.json | 6 ++++-- tests/k8s-azure/manifest/linux-autoscaler.json | 6 ++++-- tests/k8s-azure/manifest/linux-kcm.json | 4 ++-- tests/k8s-azure/manifest/linux-vmss-multi-zones.json | 6 ++++-- tests/k8s-azure/manifest/linux-vmss-serial.json | 6 ++++-- tests/k8s-azure/manifest/linux-vmss.json | 6 ++++-- tests/k8s-azure/manifest/linux.json | 6 ++++-- 8 files changed, 30 insertions(+), 16 deletions(-) diff --git a/examples/aks-engine.json b/examples/aks-engine.json index 0e7ede5fd1..a1cd5b50a4 100644 --- a/examples/aks-engine.json +++ b/examples/aks-engine.json @@ -23,7 +23,8 @@ "masterProfile": { "count": 1, "dnsPrefix": "k8s", - "vmSize": "Standard_D2_v3" + "vmSize": "Standard_D2_v3", + "distro": "aks-ubuntu-16.04" }, "agentPoolProfiles": [ { @@ -31,7 +32,8 @@ "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 index 8e2ac78e3e..b5e8178448 100644 --- 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 index 1e8ecaf36e..b012a793d6 100644 --- a/tests/k8s-azure/manifest/linux-autoscaler.json +++ b/tests/k8s-azure/manifest/linux-autoscaler.json @@ -33,7 +33,8 @@ "masterProfile": { "count": 1, "dnsPrefix": "{dnsPrefix}", - "vmSize": "Standard_F2" + "vmSize": "Standard_F2", + "distro": "aks-ubuntu-16.04" }, "agentPoolProfiles": [ { @@ -41,7 +42,8 @@ "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 index 9b561982fe..4a1806aeb2 100644 --- 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 index 0d3ef093da..2573a2de90 100644 --- 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 index 905147977e..d3538cef84 100644 --- 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 index 5c1a76863d..406f35ad1b 100644 --- a/tests/k8s-azure/manifest/linux-vmss.json +++ b/tests/k8s-azure/manifest/linux-vmss.json @@ -23,7 +23,8 @@ "masterProfile": { "count": 1, "dnsPrefix": "{dnsPrefix}", - "vmSize": "Standard_F2" + "vmSize": "Standard_F2", + "distro": "aks-ubuntu-16.04" }, "agentPoolProfiles": [ { @@ -31,7 +32,8 @@ "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 index 7bfeaa5488..83d852bef5 100644 --- a/tests/k8s-azure/manifest/linux.json +++ b/tests/k8s-azure/manifest/linux.json @@ -23,7 +23,8 @@ "masterProfile": { "count": 1, "dnsPrefix": "{dnsPrefix}", - "vmSize": "Standard_F2" + "vmSize": "Standard_F2", + "distro": "aks-ubuntu-16.04" }, "agentPoolProfiles": [ { @@ -31,7 +32,8 @@ "count": 2, "vmSize": "Standard_F2", "availabilityProfile": "AvailabilitySet", - "storageProfile": "ManagedDisks" + "storageProfile": "ManagedDisks", + "distro": "aks-ubuntu-16.04" } ], "linuxProfile": {