From a46731632350acd3964ae9f46c35ef10020b6e59 Mon Sep 17 00:00:00 2001 From: Abel Hu Date: Mon, 8 Apr 2024 01:13:26 +0000 Subject: [PATCH] chore: cache Windows containerd v1.7.14 --- parts/windows/windowscsehelper.ps1 | 1 + vhdbuilder/packer/generate-windows-vhd-configuration.ps1 | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/parts/windows/windowscsehelper.ps1 b/parts/windows/windowscsehelper.ps1 index c2e2cda40b2..e6c77a57ecd 100644 --- a/parts/windows/windowscsehelper.ps1 +++ b/parts/windows/windowscsehelper.ps1 @@ -140,6 +140,7 @@ $global:ErrorCodeNames = @( # NOTE: KubernetesVersion does not contain "v" $global:MinimalKubernetesVersionWithLatestContainerd = "1.28.0" # Will change it to the correct version when we support new Windows containerd version +# DEPRECATED: The contianerd package url will be set in AKS RP code. We will remove the following variables in the future. $global:StableContainerdPackage = "v1.6.21-azure.1/binaries/containerd-v1.6.21-azure.1-windows-amd64.tar.gz" # The latest containerd version $global:LatestContainerdPackage = "v1.7.9-azure.1/binaries/containerd-v1.7.9-azure.1-windows-amd64.tar.gz" diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 index 7625436a987..d8c80150349 100644 --- a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 +++ b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 @@ -21,7 +21,7 @@ $global:lowestFreeSpace = 2*1024*1024*1024 # 2GB # Add cache for another containerd version which is not installed by default $global:defaultContainerdPackageUrl = "https://acs-mirror.azureedge.net/containerd/windows/v1.6.21-azure.1/binaries/containerd-v1.6.21-azure.1-windows-amd64.tar.gz" if ($windowsSKU -Like "23H2*") { - $global:defaultContainerdPackageUrl = "https://acs-mirror.azureedge.net/containerd/windows/v1.7.9-azure.1/binaries/containerd-v1.7.9-azure.1-windows-amd64.tar.gz" + $global:defaultContainerdPackageUrl = "https://acs-mirror.azureedge.net/containerd/windows/v1.7.14-azure.1/binaries/containerd-v1.7.14-azure.1-windows-amd64.tar.gz" } # Windows Server 2019 update history can be found at https://support.microsoft.com/en-us/help/4464619 @@ -131,7 +131,8 @@ $global:map = @{ # versions synced. "c:\akse-cache\containerd\" = @( $defaultContainerdPackageUrl, - "https://acs-mirror.azureedge.net/containerd/windows/v1.7.9-azure.1/binaries/containerd-v1.7.9-azure.1-windows-amd64.tar.gz" + "https://acs-mirror.azureedge.net/containerd/windows/v1.7.9-azure.1/binaries/containerd-v1.7.9-azure.1-windows-amd64.tar.gz", + "https://acs-mirror.azureedge.net/containerd/windows/v1.7.14-azure.1/binaries/containerd-v1.7.14-azure.1-windows-amd64.tar.gz" ); "c:\akse-cache\csi-proxy\" = @( "https://acs-mirror.azureedge.net/csi-proxy/v1.1.2-hotfix.20230807/binaries/csi-proxy-v1.1.2-hotfix.20230807.tar.gz"