From f0380b72a014386c355fa553c133b1d490815dd9 Mon Sep 17 00:00:00 2001 From: QxBytes Date: Fri, 10 Jan 2025 16:06:58 -0800 Subject: [PATCH] update 1.4.x cni and cns to 1.4.59 --- parts/linux/cloud-init/artifacts/components.json | 6 +++--- vhdbuilder/packer/generate-windows-vhd-configuration.ps1 | 6 +++++- .../prefetch/internal/containerimage/testdata/prefetch.sh | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/components.json b/parts/linux/cloud-init/artifacts/components.json index 52275770abe..e01c0bbe49e 100644 --- a/parts/linux/cloud-init/artifacts/components.json +++ b/parts/linux/cloud-init/artifacts/components.json @@ -51,7 +51,7 @@ "multiArchVersionsV2": [ { "renovateTag": "registry=https://mcr.microsoft.com, name=containernetworking/azure-cni", - "latestVersion": "v1.4.58", + "latestVersion": "v1.4.59", "containerImagePrefetch": { "latestVersion": { "binaries": [ @@ -102,7 +102,7 @@ "multiArchVersionsV2": [ { "renovateTag": "registry=https://mcr.microsoft.com, name=containernetworking/azure-cns", - "latestVersion": "v1.4.58", + "latestVersion": "v1.4.59", "containerImagePrefetch": { "latestVersion": { "binaries": [ @@ -718,7 +718,7 @@ "versionsV2": [ { "renovateTag": "", - "latestVersion": "1.4.56" + "latestVersion": "1.4.59" }, { "renovateTag": "", diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 index 3c3964a5ee0..ba53fa17e8d 100644 --- a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 +++ b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 @@ -147,11 +147,13 @@ $global:imagesToPull += @( # CNS (Container Networking Service) Owner: evanbaker "mcr.microsoft.com/containernetworking/azure-cns:v1.4.58", + "mcr.microsoft.com/containernetworking/azure-cns:v1.4.59", "mcr.microsoft.com/containernetworking/azure-cns:v1.5.38", "mcr.microsoft.com/containernetworking/azure-cns:v1.6.18", # CNI installer for azure-vnet. Owner: evanbaker "mcr.microsoft.com/containernetworking/azure-cni:v1.4.58", + "mcr.microsoft.com/containernetworking/azure-cni:v1.4.59", "mcr.microsoft.com/containernetworking/azure-cni:v1.5.38", "mcr.microsoft.com/containernetworking/azure-cni:v1.6.18" ) @@ -218,8 +220,10 @@ $global:map = @{ "https://acs-mirror.azureedge.net/azure-cni/v1.6.18/binaries/azure-vnet-cni-windows-amd64-v1.6.18.zip", # Azure CNI v2 (pod subnet) "https://acs-mirror.azureedge.net/azure-cni/v1.4.58/binaries/azure-vnet-cni-swift-windows-amd64-v1.4.58.zip", + "https://acs-mirror.azureedge.net/azure-cni/v1.4.59/binaries/azure-vnet-cni-swift-windows-amd64-v1.4.59.zip", # Azure CNI for Overlay - "https://acs-mirror.azureedge.net/azure-cni/v1.4.58/binaries/azure-vnet-cni-overlay-windows-amd64-v1.4.58.zip" + "https://acs-mirror.azureedge.net/azure-cni/v1.4.58/binaries/azure-vnet-cni-overlay-windows-amd64-v1.4.58.zip", + "https://acs-mirror.azureedge.net/azure-cni/v1.4.59/binaries/azure-vnet-cni-overlay-windows-amd64-v1.4.59.zip" ); "c:\akse-cache\calico\" = @( "https://acs-mirror.azureedge.net/calico-node/v3.24.0/binaries/calico-windows-v3.24.0.zip" diff --git a/vhdbuilder/prefetch/internal/containerimage/testdata/prefetch.sh b/vhdbuilder/prefetch/internal/containerimage/testdata/prefetch.sh index 9e3eb2679bf..dfe27ba11a2 100755 --- a/vhdbuilder/prefetch/internal/containerimage/testdata/prefetch.sh +++ b/vhdbuilder/prefetch/internal/containerimage/testdata/prefetch.sh @@ -18,15 +18,17 @@ prefetch() { ctr -n k8s.io images unmount "$mount_dir" } prefetch "mcr.microsoft.com/containernetworking/azure-cni:v1.4.56" "/dropgz" +prefetch "mcr.microsoft.com/containernetworking/azure-cni:v1.4.59" "/dropgz" prefetch "mcr.microsoft.com/containernetworking/azure-cni:v1.5.38" "/dropgz" prefetch "mcr.microsoft.com/containernetworking/azure-cni:v1.5.35" "/dropgz" prefetch "mcr.microsoft.com/containernetworking/azure-cni:v1.6.13" "/dropgz" prefetch "mcr.microsoft.com/containernetworking/azure-cni:v1.6.18" "/dropgz" prefetch "mcr.microsoft.com/containernetworking/azure-cns:v1.4.56" "/usr/local/bin/azure-cns" +prefetch "mcr.microsoft.com/containernetworking/azure-cns:v1.4.59" "/usr/local/bin/azure-cns" prefetch "mcr.microsoft.com/containernetworking/azure-cns:v1.5.38" "/usr/local/bin/azure-cns" prefetch "mcr.microsoft.com/containernetworking/azure-cns:v1.5.35" "/usr/local/bin/azure-cns" prefetch "mcr.microsoft.com/containernetworking/azure-cns:v1.6.13" "/usr/local/bin/azure-cns" prefetch "mcr.microsoft.com/containernetworking/azure-cns:v1.6.18" "/usr/local/bin/azure-cns" prefetch "mcr.microsoft.com/containernetworking/azure-ipam:v0.0.7" "/dropgz" prefetch "mcr.microsoft.com/containernetworking/azure-ipam:v0.2.0" "/dropgz" -prefetch "mcr.microsoft.com/containernetworking/cni-dropgz:v0.0.20" "/dropgz" \ No newline at end of file +prefetch "mcr.microsoft.com/containernetworking/cni-dropgz:v0.0.20" "/dropgz"