diff --git a/parts/linux/cloud-init/artifacts/components.json b/parts/linux/cloud-init/artifacts/components.json index ed0f8134e2b..557c58ce529 100644 --- a/parts/linux/cloud-init/artifacts/components.json +++ b/parts/linux/cloud-init/artifacts/components.json @@ -42,25 +42,25 @@ "downloadURL": "mcr.microsoft.com/containernetworking/azure-cni:*", "amd64OnlyVersions": [], "multiArchVersions": [ - "v1.5.28", "v1.5.32", - "v1.6.0" + "v1.6.0", + "v1.6.3" ], "prefetchOptimizations": [ { - "version": "v1.5.28", + "version": "v1.5.32", "binaries": [ "dropgz" ] }, { - "version": "v1.5.32", + "version": "v1.6.0", "binaries": [ "dropgz" ] }, { - "version": "v1.6.0", + "version": "v1.6.3", "binaries": [ "dropgz" ] @@ -72,25 +72,25 @@ "amd64OnlyVersions": [], "multiArchVersions": [ "v1.4.52", - "v1.5.26", "v1.5.32", - "v1.6.0" + "v1.6.0", + "v1.6.3" ], "prefetchOptimizations": [ { - "version": "v1.5.26", + "version": "v1.5.32", "binaries": [ "usr/local/bin/azure-cns" ] }, { - "version": "v1.5.32", + "version": "v1.6.0", "binaries": [ "usr/local/bin/azure-cns" ] }, { - "version": "v1.6.0", + "version": "v1.6.3", "binaries": [ "usr/local/bin/azure-cns" ] @@ -481,8 +481,8 @@ "current": { "versions": [ "1.4.54", - "1.5.28", - "1.5.32" + "1.5.32", + "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 d1038d9afe7..77eac8a5ff0 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.28 1.5.32" + The variable PACKAGE_VERSIONS[@] should equal "1.4.54 1.5.32 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.28 1.5.32" + The variable PACKAGE_VERSIONS[@] should equal "1.4.54 1.5.32 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 66efc8c88cf..426edeb767a 100644 --- a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 +++ b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 @@ -125,14 +125,14 @@ $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.26", "mcr.microsoft.com/containernetworking/azure-cns:v1.5.32", "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.26" "mcr.microsoft.com/containernetworking/azure-cni:v1.5.32" + "mcr.microsoft.com/containernetworking/azure-cni:v1.6.3" ) $global:map = @{ @@ -193,8 +193,8 @@ $global:map = @{ ); "c:\akse-cache\win-vnet-cni\" = @( # Azure CNI v1 (legacy) - "https://acs-mirror.azureedge.net/azure-cni/v1.5.28/binaries/azure-vnet-cni-windows-amd64-v1.5.28.zip", "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.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", # Azure CNI for Overlay