Skip to content

Commit

Permalink
chore: update CNS, CNI, and dropgz
Browse files Browse the repository at this point in the history
Signed-off-by: Evan Baker <[email protected]>
  • Loading branch information
rbtr committed Nov 22, 2023
1 parent d168117 commit 977c881
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 17 deletions.
18 changes: 8 additions & 10 deletions vhdbuilder/packer/components.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,16 @@
"downloadURL": "mcr.microsoft.com/containernetworking/azure-cns:*",
"amd64OnlyVersions": [],
"multiArchVersions": [
"v1.4.44.5",
"v1.4.50",
"v1.5.11"
"v1.4.51",
"v1.5.15"
]
},
{
"downloadURL": "mcr.microsoft.com/containernetworking/cni-dropgz:*",
"amd64OnlyVersions": [],
"multiArchVersions": [
"v0.0.4.1",
"v0.0.11",
"v0.0.15"
"v0.0.4.2",
"v0.1.1"
]
},
{
Expand Down Expand Up @@ -314,17 +312,17 @@
"downloadLocation": "/opt/cni/downloads",
"downloadURL": "https://acs-mirror.azureedge.net/azure-cni/v*/binaries",
"versions": [
"1.5.11",
"1.4.43.1"
"1.4.51",
"1.5.15"
]
},
{
"fileName": "azure-vnet-cni-swift-linux-amd64-v*",
"downloadLocation": "/opt/cni/downloads",
"downloadURL": "https://acs-mirror.azureedge.net/azure-cni/v*/binaries",
"versions": [
"1.5.11",
"1.4.43.1"
"1.4.51",
"1.5.15"
]
},
{
Expand Down
5 changes: 2 additions & 3 deletions vhdbuilder/packer/generate-windows-vhd-configuration.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,8 @@ $global:imagesToPull += @(
# OMS-Agent (Azure monitor). Owner: ganga1980 (Ganga Mahesh Siddem)
"mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.1.15",
# CNS (Container Networking Service) Owner: jaer-tsun (Jaeryn)
"mcr.microsoft.com/containernetworking/azure-cns:v1.4.44.5",
"mcr.microsoft.com/containernetworking/azure-cns:v1.4.50",
"mcr.microsoft.com/containernetworking/azure-cns:v1.5.11"
"mcr.microsoft.com/containernetworking/azure-cns:v1.4.51",
"mcr.microsoft.com/containernetworking/azure-cns:v1.5.15"
)
$global:map = @{
Expand Down
8 changes: 4 additions & 4 deletions vhdbuilder/packer/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,8 @@ unpackAzureCNI() {

#must be both amd64/arm64 images
VNET_CNI_VERSIONS="
1.5.11
1.4.43.1
1.4.51
1.5.15
"


Expand All @@ -309,8 +309,8 @@ done
#UNITE swift and overlay versions?
#Please add new version (>=1.4.13) in this section in order that it can be pulled by both AMD64/ARM64 vhd
SWIFT_CNI_VERSIONS="
1.5.11
1.4.43.1
1.4.51
1.5.15
"

for SWIFT_CNI_VERSION in $SWIFT_CNI_VERSIONS; do
Expand Down

0 comments on commit 977c881

Please sign in to comment.