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

Signed-off-by: Evan Baker <[email protected]>
Azure · May 6, 2024 · 199e6ea · 199e6ea
1 parent ff5eab6
commit 199e6ea
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 20 deletions.
diff --git a/vhdbuilder/packer/components.json b/vhdbuilder/packer/components.json
diff --git a/vhdbuilder/packer/install-dependencies.sh b/vhdbuilder/packer/install-dependencies.sh
@@ -352,9 +352,7 @@ unpackAzureCNI() {
 
 #must be both amd64/arm64 images
 VNET_CNI_VERSIONS="
-1.4.43.1
 1.4.52
-1.5.11
 1.5.23
 "
 
@@ -366,22 +364,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.43.1
-1.4.52
-1.5.11
-1.5.23
-"
-
-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.1.1

diff --git a/vhdbuilder/packer/test/windows-files-check.ps1 b/vhdbuilder/packer/test/windows-files-check.ps1
@@ -324,4 +324,4 @@ function Test-PullImages {
 
 Test-CompareFiles
 Test-ValidateAllSignature
-Test-PullImages
+Test-PullImages