From 55153d3dab141f309c1b8205cf60e93117021f3e Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Tue, 26 Jul 2022 17:53:09 -0700 Subject: [PATCH] Add k8s 1.24.3 to VHD. (#2013) --- vhdbuilder/packer/generate-windows-vhd-configuration.ps1 | 3 ++- vhdbuilder/packer/install-dependencies.sh | 1 + vhdbuilder/packer/kube-proxy-images.json | 6 ++++-- vhdbuilder/packer/test/linux-vhd-content-test.sh | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 index 949259c19aa..97deee50235 100644 --- a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 +++ b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 @@ -173,7 +173,8 @@ $global:map = @{ "https://acs-mirror.azureedge.net/kubernetes/v1.23.8/windowszip/v1.23.8-1int.zip", "https://acs-mirror.azureedge.net/kubernetes/v1.23.5-hotfix.20220331/windowszip/v1.23.5-hotfix.20220331-1int.zip", "https://acs-mirror.azureedge.net/kubernetes/v1.23.7/windowszip/v1.23.7-1int.zip", - "https://acs-mirror.azureedge.net/kubernetes/v1.24.0/windowszip/v1.24.0-1int.zip" + "https://acs-mirror.azureedge.net/kubernetes/v1.24.0/windowszip/v1.24.0-1int.zip", + "https://acs-mirror.azureedge.net/kubernetes/v1.24.3/windowszip/v1.24.3-1int.zip" ); "c:\akse-cache\win-vnet-cni\" = @( "https://acs-mirror.azureedge.net/azure-cni/v1.4.22/binaries/azure-vnet-cni-singletenancy-windows-amd64-v1.4.22.zip", diff --git a/vhdbuilder/packer/install-dependencies.sh b/vhdbuilder/packer/install-dependencies.sh index e77742a5619..030085607ac 100644 --- a/vhdbuilder/packer/install-dependencies.sh +++ b/vhdbuilder/packer/install-dependencies.sh @@ -492,6 +492,7 @@ MULTI_ARCH_KUBE_BINARY_VERSIONS=" 1.23.5-hotfix.20220615 1.23.8-hotfix.20220620 1.24.0-hotfix.20220615 +1.24.3 " KUBE_BINARY_VERSIONS="${MULTI_ARCH_KUBE_BINARY_VERSIONS}" diff --git a/vhdbuilder/packer/kube-proxy-images.json b/vhdbuilder/packer/kube-proxy-images.json index e022c5df3d8..0eca09454b3 100644 --- a/vhdbuilder/packer/kube-proxy-images.json +++ b/vhdbuilder/packer/kube-proxy-images.json @@ -18,7 +18,8 @@ "1.23.8-hotfix.20220620.1", "1.23.8-hotfix.20220620.2", "1.24.0-hotfix.20220615.1", - "1.24.0-hotfix.20220615.2" + "1.24.0-hotfix.20220615.2", + "1.24.3.1" ] } ] @@ -42,7 +43,8 @@ "1.23.8-hotfix.20220620.1", "1.23.8-hotfix.20220620.2", "1.24.0-hotfix.20220615.1", - "1.24.0-hotfix.20220615.2" + "1.24.0-hotfix.20220615.2", + "1.24.3.1" ] } ] diff --git a/vhdbuilder/packer/test/linux-vhd-content-test.sh b/vhdbuilder/packer/test/linux-vhd-content-test.sh index 9b94b28854b..27388e4b2f8 100644 --- a/vhdbuilder/packer/test/linux-vhd-content-test.sh +++ b/vhdbuilder/packer/test/linux-vhd-content-test.sh @@ -234,6 +234,7 @@ testKubeBinariesPresent() { 1.23.5-hotfix.20220615 1.23.8-hotfix.20220620 1.24.0-hotfix.20220615 + 1.24.3 " for patchedK8sVersion in ${k8sVersions}; do # Only need to store k8s components >= 1.19 for containerd VHDs