feat: add support for Kubernetes v1.24.0-alpha.2 (#4825)

See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.24.md#changelog-since-v1240-alpha1

.pipelines/pr-e2e.yaml

@@ -162,3 +162,13 @@ jobs:
     enableKMSEncryption: false
     containerRuntime: 'containerd'
     runSSHTests: true
+
+- template: e2e-job-template.yaml
+  parameters:
+    name: 'k8s_1_24_containerd_e2e'
+    k8sRelease: '1.24'
+    apimodel: 'examples/e2e-tests/kubernetes/release/default/definition-no-vnet.json'
+    createVNET: false
+    enableKMSEncryption: false
+    containerRuntime: 'containerd'
+    runSSHTests: true

Jenkinsfile

@@ -6,7 +6,7 @@ defaultEnv = [
 	VALIDATE_CPU_LOAD: false,
 	] + params
 
-def k8sVersions = ["1.19", "1.20", "1.21", "1.22", "1.23"]
+def k8sVersions = ["1.19", "1.20", "1.21", "1.22", "1.23", "1.24"]
 def latestReleasedVersion = "1.23"
 def tasks = [:]
 def testConfigs = []

cmd/generate_test.go

@@ -587,6 +587,11 @@ func TestExampleAPIModels(t *testing.T) {
 			apiModelPath: "../examples/kubernetes-releases/kubernetes1.23.json",
 			setArgs:      defaultSet,
 		},
+		{
+			name:         "1.24 example",
+			apiModelPath: "../examples/kubernetes-releases/kubernetes1.24.json",
+			setArgs:      defaultSet,
+		},
 		{
 			name:         "vmss",
 			apiModelPath: "../examples/kubernetes-vmss/kubernetes.json",

examples/kubernetes-releases/kubernetes1.24.json

@@ -0,0 +1,30 @@
+{
+  "apiVersion": "vlabs",
+  "properties": {
+    "orchestratorProfile": {
+      "orchestratorRelease": "1.24"
+    },
+    "masterProfile": {
+      "count": 1,
+      "dnsPrefix": "",
+      "vmSize": "Standard_D2_v3"
+    },
+    "agentPoolProfiles": [
+      {
+        "name": "agentpool1",
+        "count": 3,
+        "vmSize": "Standard_D2_v3"
+      }
+    ],
+    "linuxProfile": {
+      "adminUsername": "azureuser",
+      "ssh": {
+        "publicKeys": [
+          {
+            "keyData": ""
+          }
+        ]
+      }
+    }
+  }
+}

pkg/api/common/versions.go

@@ -312,7 +312,7 @@ var AllKubernetesSupportedVersions = map[string]bool{
 	"1.23.1":         false,
 	"1.23.2":         false,
 	"1.23.3":         true,
-	"1.24.0-alpha":   true, // this does not actually exist but is needed to unblock k/k tests
+	"1.24.0-alpha.2": true,
 }
 
 // AllKubernetesSupportedVersionsAzureStack is a hash table of all supported Kubernetes version strings on Azure Stack

vhd/packer/configure-windows-vhd.ps1

@@ -124,7 +124,8 @@ function Get-FilesToCacheOnVHD {
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.14/windowszip/v1.20.14-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.21.9/windowszip/v1.21.9-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.22.6/windowszip/v1.22.6-1int.zip",
-            "https://kubernetesartifacts.azureedge.net/kubernetes/v1.23.3/windowszip/v1.23.3-1int.zip"
+            "https://kubernetesartifacts.azureedge.net/kubernetes/v1.23.3/windowszip/v1.23.3-1int.zip",
+            "https://kubernetesartifacts.azureedge.net/kubernetes/v1.24.0-alpha.2/windowszip/v1.24.0-alpha.2-1int.zip"
         );
         "c:\akse-cache\win-vnet-cni\" = @(
             "https://kubernetesartifacts.azureedge.net/azure-cni/v1.4.13/binaries/azure-vnet-cni-singletenancy-windows-amd64-v1.4.13.zip",

vhd/packer/install-dependencies.sh

@@ -219,6 +219,7 @@ loadContainerImage "busybox"
 echo "  - busybox" >> ${VHD_LOGS_FILEPATH}
 
 K8S_VERSIONS="
+1.24.0-alpha.2
 1.23.3
 1.22.6
 1.21.9