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: remove azure-vnet binaries which are installed from container #4295

Merged
merged 1 commit into from
May 28, 2024
Merged

chore: remove azure-vnet binaries which are installed from container #4295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 0 additions & 13 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 @@ -353,20 +353,7 @@
"downloadLocation": "/opt/cni/downloads",
"downloadURL": "https://acs-mirror.azureedge.net/azure-cni/v*/binaries",
"versions": [
"1.4.52",
"1.4.54",
"1.5.23",
"1.5.28"
]
},
{
"fileName": "azure-vnet-cni-swift-linux-amd64-v*",
"downloadLocation": "/opt/cni/downloads",
"downloadURL": "https://acs-mirror.azureedge.net/azure-cni/v*/binaries",
"versions": [
"1.4.52",
"1.4.54",
"1.5.23",
"1.5.28"
]
},
Expand Down
18 changes: 0 additions & 18 deletions vhdbuilder/packer/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,7 @@ unpackAzureCNI() {

#must be both amd64/arm64 images
VNET_CNI_VERSIONS="
1.4.52
1.4.54
1.5.23
1.5.28
"

Expand All @@ -370,22 +368,6 @@ for VNET_CNI_VERSION in $VNET_CNI_VERSIONS; do
echo " - Azure CNI version ${VNET_CNI_VERSION}" >> ${VHD_LOGS_FILEPATH}
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.4.52
1.4.54
1.5.23
1.5.28
"

for SWIFT_CNI_VERSION in $SWIFT_CNI_VERSIONS; do
VNET_CNI_PLUGINS_URL="https://acs-mirror.azureedge.net/azure-cni/v${SWIFT_CNI_VERSION}/binaries/azure-vnet-cni-swift-linux-${CPU_ARCH}-v${SWIFT_CNI_VERSION}.tgz"
downloadAzureCNI
unpackAzureCNI $VNET_CNI_PLUGINS_URL
echo " - Azure Swift CNI version ${SWIFT_CNI_VERSION}" >> ${VHD_LOGS_FILEPATH}
done

# After v0.7.6, URI was changed to renamed to https://acs-mirror.azureedge.net/cni-plugins/v*/binaries/cni-plugins-linux-arm64-v*.tgz
MULTI_ARCH_CNI_PLUGIN_VERSIONS="
1.4.1
Expand Down
2 changes: 1 addition & 1 deletion vhdbuilder/packer/test/windows-files-check.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,4 +324,4 @@ function Test-PullImages {

Test-CompareFiles
Test-ValidateAllSignature
Test-PullImages
Test-PullImages
Loading