From 7fc48ac7fcbf3c92f6c3c08545da6aa9df27c7f9 Mon Sep 17 00:00:00 2001 From: Santhosh Prabhu <6684582+santhoshmprabhu@users.noreply.github.com> Date: Thu, 9 Jan 2025 09:11:35 -0800 Subject: [PATCH] chore: use cns/cni version 1.6.18 (#5513) --- parts/linux/cloud-init/artifacts/components.json | 12 ++++++------ .../packer/generate-windows-vhd-configuration.ps1 | 6 +++--- .../internal/containerimage/testdata/prefetch.sh | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/components.json b/parts/linux/cloud-init/artifacts/components.json index 40eca083ddc..910bdfd1141 100644 --- a/parts/linux/cloud-init/artifacts/components.json +++ b/parts/linux/cloud-init/artifacts/components.json @@ -79,8 +79,8 @@ }, { "renovateTag": "registry=https://mcr.microsoft.com, name=containernetworking/azure-cni", - "latestVersion": "v1.6.13", - "previousLatestVersion": "v1.6.7", + "latestVersion": "v1.6.18", + "previousLatestVersion": "v1.6.13", "containerImagePrefetch": { "latestVersion": { "binaries": [ @@ -130,8 +130,8 @@ }, { "renovateTag": "registry=https://mcr.microsoft.com, name=containernetworking/azure-cns", - "latestVersion": "v1.6.13", - "previousLatestVersion": "v1.6.7", + "latestVersion": "v1.6.18", + "previousLatestVersion": "v1.6.13", "containerImagePrefetch": { "latestVersion": { "binaries": [ @@ -727,8 +727,8 @@ }, { "renovateTag": "", - "latestVersion": "1.6.13", - "previousLatestVersion": "1.6.7" + "latestVersion": "1.6.18", + "previousLatestVersion": "1.6.13" } ], "downloadURL": "https://acs-mirror.azureedge.net/azure-cni/v${version}/binaries/azure-vnet-cni-linux-${CPU_ARCH}-v${version}.tgz" diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 index 30cd39670c2..3c3964a5ee0 100644 --- a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 +++ b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 @@ -148,12 +148,12 @@ $global:imagesToPull += @( # CNS (Container Networking Service) Owner: evanbaker "mcr.microsoft.com/containernetworking/azure-cns:v1.4.58", "mcr.microsoft.com/containernetworking/azure-cns:v1.5.38", - "mcr.microsoft.com/containernetworking/azure-cns:v1.6.13", + "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.5.38", - "mcr.microsoft.com/containernetworking/azure-cni:v1.6.13" + "mcr.microsoft.com/containernetworking/azure-cni:v1.6.18" ) $global:map = @{ @@ -215,7 +215,7 @@ $global:map = @{ "c:\akse-cache\win-vnet-cni\" = @( # Azure CNI v1 (legacy) "https://acs-mirror.azureedge.net/azure-cni/v1.5.38/binaries/azure-vnet-cni-windows-amd64-v1.5.38.zip", - "https://acs-mirror.azureedge.net/azure-cni/v1.6.13/binaries/azure-vnet-cni-windows-amd64-v1.6.13.zip", + "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", # Azure CNI for Overlay diff --git a/vhdbuilder/prefetch/internal/containerimage/testdata/prefetch.sh b/vhdbuilder/prefetch/internal/containerimage/testdata/prefetch.sh index 5b5100424be..9e3eb2679bf 100755 --- a/vhdbuilder/prefetch/internal/containerimage/testdata/prefetch.sh +++ b/vhdbuilder/prefetch/internal/containerimage/testdata/prefetch.sh @@ -21,12 +21,12 @@ prefetch "mcr.microsoft.com/containernetworking/azure-cni:v1.4.56" "/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.7" "/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.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.7" "/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