Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump cni cns versions from v1.5.32 to v1.5.35 for release/v1.5 #4895

Merged
merged 12 commits into from
Sep 11, 2024
Merged

chore: bump cni cns versions from v1.5.32 to v1.5.35 for release/v1.5 #4895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
07a0de3
chore: bump cni cns versions from v1.5.32 to v1.5.35 for release/v1.5
kmurudi Sep 3, 2024
f1c2e33
retain 1.5.32 & add 1.6.5 instead of 1.6.3 for new tag
kmurudi Sep 4, 2024
e7b90f0
Merge branch 'master' into kmurudi_cni1.5.35
kmurudi Sep 4, 2024
4ddda45
fix image ver
kmurudi Sep 4, 2024
73bc7c6
Merge branch 'master' into kmurudi_cni1.5.35
kmurudi Sep 5, 2024
d3f2996
Merge branch 'master' into kmurudi_cni1.5.35
kmurudi Sep 5, 2024
170240d
Merge branch 'master' into kmurudi_cni1.5.35
kmurudi Sep 5, 2024
12c3ed7
Merge branch 'master' into kmurudi_cni1.5.35
kmurudi Sep 5, 2024
4376314
Merge branch 'master' into kmurudi_cni1.5.35
kmurudi Sep 6, 2024
7c78cd8
Merge branch 'master' into kmurudi_cni1.5.35
kmurudi Sep 11, 2024
e2b11d9
Merge branch 'master' into kmurudi_cni1.5.35
kmurudi Sep 11, 2024
b3480ef
Merge branch 'master' into kmurudi_cni1.5.35
kmurudi Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions parts/linux/cloud-init/artifacts/components.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@
"amd64OnlyVersions": [],
"multiArchVersions": [
"v1.5.32",
"v1.5.35",
"v1.6.0",
"v1.6.3"
"v1.6.5"
],
"prefetchOptimizations": [
{
Expand All @@ -53,14 +54,20 @@
"dropgz"
]
},
{
"version": "v1.5.35",
"binaries": [
"dropgz"
]
},
{
"version": "v1.6.0",
"binaries": [
"dropgz"
]
},
{
"version": "v1.6.3",
"version": "v1.6.5",
"binaries": [
"dropgz"
]
Expand All @@ -73,8 +80,9 @@
"multiArchVersions": [
"v1.4.52",
"v1.5.32",
"v1.5.35",
"v1.6.0",
"v1.6.3"
"v1.6.5"
],
"prefetchOptimizations": [
{
Expand All @@ -83,14 +91,20 @@
"usr/local/bin/azure-cns"
]
},
{
"version": "v1.5.35",
"binaries": [
"usr/local/bin/azure-cns"
]
},
{
"version": "v1.6.0",
"binaries": [
"usr/local/bin/azure-cns"
]
},
{
"version": "v1.6.3",
"version": "v1.6.5",
"binaries": [
"usr/local/bin/azure-cns"
]
Expand Down Expand Up @@ -488,7 +502,8 @@
"versions": [
"1.4.54",
"1.5.32",
"1.6.3"
"1.5.35",
"1.6.5"
],
"downloadURL": "https://acs-mirror.azureedge.net/azure-cni/v${version}/binaries/azure-vnet-cni-linux-${CPU_ARCH}-v${version}.tgz"
}
Expand Down
6 changes: 3 additions & 3 deletions spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.32 1.5.35 1.6.5"
End

It 'returns downloadURIs.default.current.versions of package oras for UBUNTU 20.04'
Expand Down Expand Up @@ -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.32 1.5.35 1.6.5"
End

It 'returns downloadURIs.default.current.versions of package containerd for MARINERKATA'
Expand All @@ -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'
Expand Down
11 changes: 7 additions & 4 deletions vhdbuilder/packer/generate-windows-vhd-configuration.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,15 @@ $global:imagesToPull += @(
# 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.6.3"
"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.5"
)

$global:map = @{
Expand Down Expand Up @@ -188,7 +190,8 @@ $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.6.3/binaries/azure-vnet-cni-windows-amd64-v1.6.3.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.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
Expand Down
Loading