test: stop testing Ubuntu 16.04-LTS (#4686)

Azure · Oct 4, 2021 · 910e4bd · 910e4bd
1 parent 271e035
commit 910e4bd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 20 deletions.
diff --git a/examples/e2e-tests/kubernetes/release/default/definition-no-vnet.json b/examples/e2e-tests/kubernetes/release/default/definition-no-vnet.json
@@ -66,13 +66,6 @@
                 "availabilityProfile": "VirtualMachineScaleSets",
                 "osType": "Windows"
             },
-            {
-                "name": "pool1604vhd",
-                "count": 1,
-                "vmSize": "Standard_D2_v3",
-                "distro": "aks-ubuntu-16.04",
-                "availabilityProfile": "VirtualMachineScaleSets"
-            },
             {
                 "name": "pool1804",
                 "count": 1,

diff --git a/examples/e2e-tests/kubernetes/release/default/definition.json b/examples/e2e-tests/kubernetes/release/default/definition.json
@@ -72,14 +72,6 @@
         "vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/SUBNET_NAME",
         "osType": "Windows"
       },
-      {
-        "name": "pool1604vhd",
-        "count": 1,
-        "vmSize": "Standard_D2_v3",
-        "distro": "aks-ubuntu-16.04",
-        "availabilityProfile": "VirtualMachineScaleSets",
-        "vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/SUBNET_NAME"
-      },
       {
         "name": "pool1804",
         "count": 1,

diff --git a/pkg/engine/testdata/azurestack/kubernetes-ubuntu16.json b/pkg/engine/testdata/azurestack/kubernetes-ubuntu16.json
@@ -35,7 +35,7 @@
         },
         "masterProfile": {
             "dnsPrefix": "k111007",
-            "distro": "aks-ubuntu-16.04",
+            "distro": "aks-ubuntu-18.04",
             "osDiskSizeGB": 200,
             "count": 3,
             "vmSize": "Standard_D2_v2"
@@ -46,7 +46,7 @@
                 "osDiskSizeGB": 200,
                 "count": 3,
                 "vmSize": "Standard_D2_v2",
-                "distro": "aks-ubuntu-16.04",
+                "distro": "aks-ubuntu-18.04",
                 "availabilityProfile": "AvailabilitySet",
                 "AcceleratedNetworkingEnabled": false
             },

diff --git a/pkg/engine/testdata/key-vault-certs/kubernetes.json b/pkg/engine/testdata/key-vault-certs/kubernetes.json
@@ -326,7 +326,7 @@
       "oauthEnabled": false,
       "preProvisionExtension": null,
       "extensions": [],
-      "distro": "aks-ubuntu-16.04",
+      "distro": "aks-ubuntu-18.04",
       "kubernetesConfig": {
         "kubeletConfig": {
           "--address": "0.0.0.0",
@@ -370,7 +370,7 @@
         "osType": "Linux",
         "availabilityProfile": "VirtualMachineScaleSets",
         "storageProfile": "ManagedDisks",
-        "distro": "aks-ubuntu-16.04",
+        "distro": "aks-ubuntu-18.04",
         "kubernetesConfig": {
           "kubeletConfig": {
             "--address": "0.0.0.0",
@@ -459,4 +459,4 @@
       ]
     }
   }
-}
+}