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

Signed-off-by: Evan Baker <[email protected]>
Azure · Apr 15, 2024 · e7da447 · e7da447
1 parent a215f0e
commit e7da447
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 39 deletions.
diff --git a/vhdbuilder/packer/components.json b/vhdbuilder/packer/components.json
@@ -369,20 +369,7 @@
       "downloadLocation": "/opt/cni/downloads",
       "downloadURL": "https://acs-mirror.azureedge.net/azure-cni/v*/binaries",
       "versions": [
-        "1.4.43.1",
         "1.4.52",
-        "1.5.11",
-        "1.5.23"
-      ]
-    },
-    {
-      "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.43.1",
-        "1.4.52",
-        "1.5.11",
         "1.5.23"
       ]
     },

diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1
@@ -164,11 +164,7 @@ $global:map = @{
     );
     "c:\akse-cache\win-vnet-cni\" = @(
         # Azure CNI v1 (legacy)
-        "https://acs-mirror.azureedge.net/azure-cni/v1.5.6.1/binaries/azure-vnet-cni-singletenancy-windows-amd64-v1.5.6.1.zip",
-        # Azure CNI v2 (pod subnet) upgrading from v1.4.39.1 (unsigned) to v1.4.39.2 (signed)
-        "https://acs-mirror.azureedge.net/azure-cni/v1.4.39.2/binaries/azure-vnet-cni-singletenancy-swift-windows-amd64-v1.4.39.2.zip",
-        # Azure CNI for Overlay upgrading from v1.4.39.1 (unsigned) to v1.4.39.2 (signed)
-        "https://acs-mirror.azureedge.net/azure-cni/v1.4.39.2/binaries/azure-vnet-cni-singletenancy-overlay-windows-amd64-v1.4.39.2.zip"
+        "https://acs-mirror.azureedge.net/azure-cni/v1.5.6.1/binaries/azure-vnet-cni-singletenancy-windows-amd64-v1.5.6.1.zip"
     );
     "c:\akse-cache\calico\" = @(
         "https://acs-mirror.azureedge.net/calico-node/v3.24.0/binaries/calico-windows-v3.24.0.zip"

diff --git a/vhdbuilder/packer/install-dependencies.sh b/vhdbuilder/packer/install-dependencies.sh
@@ -343,22 +343,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
@@ -181,8 +181,6 @@ function Test-CompareSingleDir {
     $excludeHashComparisionListInAzureChinaCloud = @(
         "calico-windows",
         "azure-vnet-cni-singletenancy-windows-amd64",
-        "azure-vnet-cni-singletenancy-swift-windows-amd64",
-        "azure-vnet-cni-singletenancy-overlay-windows-amd64",
         # We need upstream's help to republish this package. Before that, it does not impact functionality and 1.26 is only in public preview
         # so we can ignore the different hash values.
         "v1.26.0-1int.zip"
@@ -324,4 +322,4 @@ function Test-PullImages {
 
 Test-CompareFiles
 Test-ValidateAllSignature
-Test-PullImages
+Test-PullImages
diff --git a/vhdbuilder/packer/test/windows-vhd-content-test.ps1 b/vhdbuilder/packer/test/windows-vhd-content-test.ps1
@@ -143,8 +143,6 @@ function Test-FilesToCacheOnVHD
                         $excludeHashComparisionListInAzureChinaCloud = @(
                             "calico-windows",
                             "azure-vnet-cni-singletenancy-windows-amd64",
-                            "azure-vnet-cni-singletenancy-swift-windows-amd64",
-                            "azure-vnet-cni-singletenancy-overlay-windows-amd64",
                             # We need upstream's help to republish this package. Before that, it does not impact functionality and 1.26 is only in public preview
                             # so we can ignore the different hash values.
                             "v1.26.0-1int.zip"