From 07a0de3c674ac1a39722413e1398385a3b37207e Mon Sep 17 00:00:00 2001 From: Kshitija Murudi Date: Tue, 3 Sep 2024 11:35:51 -0700 Subject: [PATCH 1/3] chore: bump cni cns versions from v1.5.32 to v1.5.35 for release/v1.5 --- parts/linux/cloud-init/artifacts/components.json | 10 +++++----- .../linux/cloud-init/artifacts/cse_install_spec.sh | 4 ++-- .../packer/generate-windows-vhd-configuration.ps1 | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/components.json b/parts/linux/cloud-init/artifacts/components.json index db36aa013fa..76c99baac61 100644 --- a/parts/linux/cloud-init/artifacts/components.json +++ b/parts/linux/cloud-init/artifacts/components.json @@ -42,13 +42,13 @@ "downloadURL": "mcr.microsoft.com/containernetworking/azure-cni:*", "amd64OnlyVersions": [], "multiArchVersions": [ - "v1.5.32", + "v1.5.35", "v1.6.0", "v1.6.3" ], "prefetchOptimizations": [ { - "version": "v1.5.32", + "version": "v1.5.35", "binaries": [ "dropgz" ] @@ -72,13 +72,13 @@ "amd64OnlyVersions": [], "multiArchVersions": [ "v1.4.52", - "v1.5.32", + "v1.5.35", "v1.6.0", "v1.6.3" ], "prefetchOptimizations": [ { - "version": "v1.5.32", + "version": "v1.5.35", "binaries": [ "usr/local/bin/azure-cns" ] @@ -485,7 +485,7 @@ "current": { "versions": [ "1.4.54", - "1.5.32", + "1.5.35", "1.6.3" ], "downloadURL": "https://acs-mirror.azureedge.net/azure-cni/v${version}/binaries/azure-vnet-cni-linux-${CPU_ARCH}-v${version}.tgz" diff --git a/spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh b/spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh index 77eac8a5ff0..e49853e3e51 100644 --- a/spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh +++ b/spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh @@ -40,7 +40,7 @@ Describe 'cse_install.sh' It 'returns downloadURIs.default.current.versions of package azure-cni for UBUNTU 20.04' package=$(readPackage "azure-cni") When call returnPackageVersions "$package" "UBUNTU" "20.04" - The variable PACKAGE_VERSIONS[@] should equal "1.4.54 1.5.32 1.6.3" + The variable PACKAGE_VERSIONS[@] should equal "1.4.54 1.5.35 1.6.3" End It 'returns downloadURIs.default.current.versions of package oras for UBUNTU 20.04' @@ -70,7 +70,7 @@ Describe 'cse_install.sh' It 'returns downloadURIs.default.current.versions of package azure-cni for MARINER' package=$(readPackage "azure-cni") When call returnPackageVersions "$package" "MARINER" "some_mariner_version" - The variable PACKAGE_VERSIONS[@] should equal "1.4.54 1.5.32 1.6.3" + The variable PACKAGE_VERSIONS[@] should equal "1.4.54 1.5.35 1.6.3" End It 'returns downloadURIs.default.current.versions of package containerd for MARINERKATA' diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 index 993c07bf17d..15d09b8535c 100644 --- a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 +++ b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 @@ -125,13 +125,13 @@ $global:imagesToPull += @( "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.1.23", # CNS (Container Networking Service) Owner: jaer-tsun (Jaeryn) "mcr.microsoft.com/containernetworking/azure-cns:v1.4.52", - "mcr.microsoft.com/containernetworking/azure-cns:v1.5.32", + "mcr.microsoft.com/containernetworking/azure-cns:v1.5.35", "mcr.microsoft.com/containernetworking/azure-cns:v1.6.0", "mcr.microsoft.com/containernetworking/azure-cns:v1.6.3", # CNI installer for azure-vnet. Owner: evanbaker "mcr.microsoft.com/containernetworking/cni-dropgz:v0.1.4" "mcr.microsoft.com/containernetworking/cni-dropgz:v0.2.0" - "mcr.microsoft.com/containernetworking/azure-cni:v1.5.32" + "mcr.microsoft.com/containernetworking/azure-cni:v1.5.35" "mcr.microsoft.com/containernetworking/azure-cni:v1.6.3" ) @@ -196,7 +196,7 @@ $global:map = @{ ); "c:\akse-cache\win-vnet-cni\" = @( # Azure CNI v1 (legacy) - "https://acs-mirror.azureedge.net/azure-cni/v1.5.32/binaries/azure-vnet-cni-windows-amd64-v1.5.32.zip", + "https://acs-mirror.azureedge.net/azure-cni/v1.5.35/binaries/azure-vnet-cni-windows-amd64-v1.5.35.zip", "https://acs-mirror.azureedge.net/azure-cni/v1.6.3/binaries/azure-vnet-cni-windows-amd64-v1.6.3.zip", # Azure CNI v2 (pod subnet) "https://acs-mirror.azureedge.net/azure-cni/v1.4.54/binaries/azure-vnet-cni-swift-windows-amd64-v1.4.54.zip", From f1c2e33a348758f481a9e07c83e9d8f7e56a43a8 Mon Sep 17 00:00:00 2001 From: Kshitija Murudi Date: Tue, 3 Sep 2024 17:09:17 -0700 Subject: [PATCH 2/3] retain 1.5.32 & add 1.6.5 instead of 1.6.3 for new tag --- .../cloud-init/artifacts/components.json | 23 +++++++++++++++---- .../cloud-init/artifacts/cse_install_spec.sh | 4 ++-- .../generate-windows-vhd-configuration.ps1 | 9 +++++--- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/components.json b/parts/linux/cloud-init/artifacts/components.json index 76c99baac61..3ddcc623d0d 100644 --- a/parts/linux/cloud-init/artifacts/components.json +++ b/parts/linux/cloud-init/artifacts/components.json @@ -42,11 +42,18 @@ "downloadURL": "mcr.microsoft.com/containernetworking/azure-cni:*", "amd64OnlyVersions": [], "multiArchVersions": [ + "v1.5.32", "v1.5.35", "v1.6.0", - "v1.6.3" + "v1.6.5" ], "prefetchOptimizations": [ + { + "version": "v1.5.32", + "binaries": [ + "dropgz" + ] + }, { "version": "v1.5.35", "binaries": [ @@ -60,7 +67,7 @@ ] }, { - "version": "v1.6.3", + "version": "v1.6.5", "binaries": [ "dropgz" ] @@ -72,11 +79,18 @@ "amd64OnlyVersions": [], "multiArchVersions": [ "v1.4.52", + "v1.5.32", "v1.5.35", "v1.6.0", - "v1.6.3" + "v1.6.5" ], "prefetchOptimizations": [ + { + "version": "v1.5.32", + "binaries": [ + "usr/local/bin/azure-cns" + ] + }, { "version": "v1.5.35", "binaries": [ @@ -90,7 +104,7 @@ ] }, { - "version": "v1.6.3", + "version": "v1.6.5", "binaries": [ "usr/local/bin/azure-cns" ] @@ -485,6 +499,7 @@ "current": { "versions": [ "1.4.54", + "1.5.32", "1.5.35", "1.6.3" ], diff --git a/spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh b/spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh index e49853e3e51..b92ac224622 100644 --- a/spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh +++ b/spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh @@ -40,7 +40,7 @@ Describe 'cse_install.sh' It 'returns downloadURIs.default.current.versions of package azure-cni for UBUNTU 20.04' package=$(readPackage "azure-cni") When call returnPackageVersions "$package" "UBUNTU" "20.04" - The variable PACKAGE_VERSIONS[@] should equal "1.4.54 1.5.35 1.6.3" + The variable PACKAGE_VERSIONS[@] should equal "1.4.54 1.5.32 1.5.35 1.6.5" End It 'returns downloadURIs.default.current.versions of package oras for UBUNTU 20.04' @@ -70,7 +70,7 @@ Describe 'cse_install.sh' It 'returns downloadURIs.default.current.versions of package azure-cni for MARINER' package=$(readPackage "azure-cni") When call returnPackageVersions "$package" "MARINER" "some_mariner_version" - The variable PACKAGE_VERSIONS[@] should equal "1.4.54 1.5.35 1.6.3" + The variable PACKAGE_VERSIONS[@] should equal "1.4.54 1.5.32 1.5.35 1.6.5" End It 'returns downloadURIs.default.current.versions of package containerd for MARINERKATA' diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 index 15d09b8535c..9a7c8f75ea5 100644 --- a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 +++ b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 @@ -125,14 +125,16 @@ $global:imagesToPull += @( "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.1.23", # CNS (Container Networking Service) Owner: jaer-tsun (Jaeryn) "mcr.microsoft.com/containernetworking/azure-cns:v1.4.52", + "mcr.microsoft.com/containernetworking/azure-cns:v1.5.32", "mcr.microsoft.com/containernetworking/azure-cns:v1.5.35", "mcr.microsoft.com/containernetworking/azure-cns:v1.6.0", - "mcr.microsoft.com/containernetworking/azure-cns:v1.6.3", + "mcr.microsoft.com/containernetworking/azure-cns:v1.6.5", # CNI installer for azure-vnet. Owner: evanbaker "mcr.microsoft.com/containernetworking/cni-dropgz:v0.1.4" "mcr.microsoft.com/containernetworking/cni-dropgz:v0.2.0" + "mcr.microsoft.com/containernetworking/azure-cni:v1.5.32", "mcr.microsoft.com/containernetworking/azure-cni:v1.5.35" - "mcr.microsoft.com/containernetworking/azure-cni:v1.6.3" + "mcr.microsoft.com/containernetworking/azure-cni:v1.6.5" ) $global:map = @{ @@ -196,8 +198,9 @@ $global:map = @{ ); "c:\akse-cache\win-vnet-cni\" = @( # Azure CNI v1 (legacy) + "https://acs-mirror.azureedge.net/azure-cni/v1.5.32/binaries/azure-vnet-cni-windows-amd64-v1.5.32.zip", "https://acs-mirror.azureedge.net/azure-cni/v1.5.35/binaries/azure-vnet-cni-windows-amd64-v1.5.35.zip", - "https://acs-mirror.azureedge.net/azure-cni/v1.6.3/binaries/azure-vnet-cni-windows-amd64-v1.6.3.zip", + "https://acs-mirror.azureedge.net/azure-cni/v1.6.5/binaries/azure-vnet-cni-windows-amd64-v1.6.5.zip", # Azure CNI v2 (pod subnet) "https://acs-mirror.azureedge.net/azure-cni/v1.4.54/binaries/azure-vnet-cni-swift-windows-amd64-v1.4.54.zip", # Azure CNI for Overlay From 4ddda4513aa975ccf260eac5de79320ce66316b9 Mon Sep 17 00:00:00 2001 From: Kshitija Murudi Date: Wed, 4 Sep 2024 15:29:53 -0700 Subject: [PATCH 3/3] fix image ver --- parts/linux/cloud-init/artifacts/components.json | 2 +- spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/components.json b/parts/linux/cloud-init/artifacts/components.json index d56d55aff1b..fff3a4e0a78 100644 --- a/parts/linux/cloud-init/artifacts/components.json +++ b/parts/linux/cloud-init/artifacts/components.json @@ -515,7 +515,7 @@ "1.4.54", "1.5.32", "1.5.35", - "1.6.3" + "1.6.5" ], "downloadURL": "https://acs-mirror.azureedge.net/azure-cni/v${version}/binaries/azure-vnet-cni-linux-${CPU_ARCH}-v${version}.tgz" } diff --git a/spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh b/spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh index bfd2eb094f6..08262451734 100644 --- a/spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh +++ b/spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh @@ -82,7 +82,7 @@ Describe 'cse_install.sh' It 'returns downloadURIs.default.current.versions of package azure-cni for AZURELINUX' package=$(readPackage "azure-cni") When call returnPackageVersions "$package" "AZURELINUX" "some_azurelinux_version" - The variable PACKAGE_VERSIONS[@] should equal "1.4.54 1.5.32 1.6.3" + The variable PACKAGE_VERSIONS[@] should equal "1.4.54 1.5.32 1.5.35 1.6.5" End It 'returns downloadURIs.azurelinux.current.versions of package runc for AZURELINUX'