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

Signed-off-by: Evan Baker <[email protected]>
Azure · Apr 23, 2024 · 2d02129 · 2d02129
1 parent ddad5fa
commit 2d02129
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 56 deletions.
diff --git a/vhdbuilder/packer/components.json b/vhdbuilder/packer/components.json
@@ -11,7 +11,7 @@
       "downloadURL": "mcr.microsoft.com/oss/kubernetes/metrics-server:*",
       "amd64OnlyVersions": [],
       "multiArchVersions": [
-        "v0.7.1"
+        "v0.7.0"
       ]
     },
     {
@@ -47,12 +47,6 @@
         "v1.5.26"
       ],
       "prefetchOptimizations": [
-        {
-          "version": "v1.5.23",
-          "binaries": [
-            "usr/local/bin/azure-cns"
-          ]
-        },
         {
           "version": "v1.5.26",
           "binaries": [
@@ -97,25 +91,23 @@
       "amd64OnlyVersions": [],
       "multiArchVersions": [
         "v1.3.4-1",
-        "v1.4.2",
-        "v1.4.2-1",
-        "v1.4.3"
+        "v1.4.1",
+        "v1.4.2"
       ]
     },
     {
       "downloadURL": "mcr.microsoft.com/oss/azure/secrets-store/provider-azure:*",
       "amd64OnlyVersions": [],
       "multiArchVersions": [
         "v1.4.1",
-        "v1.5.1",
-        "v1.5.2"
+        "v1.5.1"
       ]
     },
     {
       "downloadURL": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:*",
       "amd64OnlyVersions": [],
       "multiArchVersions": [
-        "3.1.20"
+        "3.1.19"
       ]
     },
     {
@@ -141,7 +133,7 @@
       "downloadURL": "mcr.microsoft.com/oss/kubernetes/kube-state-metrics:*",
       "amd64OnlyVersions": [],
       "multiArchVersions": [
-        "v2.11.0"
+        "v2.9.2"
       ]
     },
     {
@@ -215,10 +207,10 @@
       "downloadURL": "mcr.microsoft.com/oss/cilium/cilium:*",
       "amd64OnlyVersions": [],
       "multiArchVersions": [
+        "1.13.10-1",
         "1.13.10-2",
-        "1.13.10-3",
-        "1.14.4-1",
-        "1.14.4-3"
+        "1.14.4",
+        "1.14.4-1"
       ]
     },
     {
@@ -262,24 +254,22 @@
       "amd64OnlyVersions": [],
       "multiArchVersions": [
         "v1.28.6",
-        "v1.28.6-2",
         "v1.28.7",
         "v1.29.3",
         "v1.29.4",
-        "v1.29.4-1",
         "v1.30.1"
       ]
     },
     {
       "downloadURL": "mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:*",
       "amd64OnlyVersions": [],
       "multiArchVersions": [
+        "v1.26.11",
         "v1.28.9",
-        "v1.28.10",
+        "v1.29.3",
         "v1.29.4",
-        "v1.29.5",
-        "v1.30.1",
-        "v1.30.2"
+        "v1.30.0",
+        "v1.30.1"
       ]
     },
     {
@@ -288,8 +278,8 @@
       "multiArchVersions": [
         "v1.22.5-3",
         "v1.22.6",
+        "v1.23.3",
         "v1.23.4",
-        "v1.23.4-2",
         "v1.24.1"
       ]
     },
@@ -379,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/install-dependencies.sh b/vhdbuilder/packer/install-dependencies.sh
@@ -329,9 +329,7 @@ unpackAzureCNI() {
 
 #must be both amd64/arm64 images
 VNET_CNI_VERSIONS="
-1.4.43.1
 1.4.52
-1.5.11
 1.5.23
 "
 
@@ -343,22 +341,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