From db715170887acd42d4c955effd8d53fb01bb2c8f Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Thu, 15 Sep 2022 15:14:02 -0600 Subject: [PATCH] feat: add support for Kubernetes v1.24.5 See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.24.md#changelog-since-v1244 --- pkg/api/common/versions.go | 3 ++- vhd/packer/configure-windows-vhd.ps1 | 2 +- vhd/packer/install-dependencies.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go index 68beac72e..f81bea8cb 100644 --- a/pkg/api/common/versions.go +++ b/pkg/api/common/versions.go @@ -338,7 +338,8 @@ var AllKubernetesSupportedVersions = map[string]bool{ "1.24.1": false, "1.24.2": false, "1.24.3": false, - "1.24.4": true, + "1.24.4": false, + "1.24.5": true, } // AllKubernetesSupportedVersionsAzureStack is a hash table of all supported Kubernetes version strings on Azure Stack diff --git a/vhd/packer/configure-windows-vhd.ps1 b/vhd/packer/configure-windows-vhd.ps1 index 8514de410..08329e3d6 100644 --- a/vhd/packer/configure-windows-vhd.ps1 +++ b/vhd/packer/configure-windows-vhd.ps1 @@ -127,7 +127,7 @@ function Get-FilesToCacheOnVHD { "https://kubernetesartifacts.azureedge.net/kubernetes/v1.22.13/windowszip/v1.22.13-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.23.6/windowszip/v1.23.6-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.23.10/windowszip/v1.23.10-1int.zip", - "https://kubernetesartifacts.azureedge.net/kubernetes/v1.24.4/windowszip/v1.24.4-1int.zip" + "https://kubernetesartifacts.azureedge.net/kubernetes/v1.24.5/windowszip/v1.24.5-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", diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh index 468aff5ac..e99338cf3 100644 --- a/vhd/packer/install-dependencies.sh +++ b/vhd/packer/install-dependencies.sh @@ -219,7 +219,7 @@ loadContainerImage "mcr.microsoft.com/oss/busybox/busybox:1.33.1" echo " - busybox" >> ${VHD_LOGS_FILEPATH} K8S_VERSIONS=" -1.24.4 +1.24.5 1.23.10 1.23.6 1.22.13