bug: cache older CNI and CNS binaries to sync with RP (#4011)

Co-authored-by: Evan Baker <[email protected]>
Azure · Feb 7, 2024 · 320a74f · 320a74f
1 parent dc72dac
commit 320a74f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 19 deletions.
diff --git a/vhdbuilder/packer/components.json b/vhdbuilder/packer/components.json
@@ -40,26 +40,21 @@
       "downloadURL": "mcr.microsoft.com/containernetworking/azure-cns:*",
       "amd64OnlyVersions": [],
       "multiArchVersions": [
-        "v1.4.51",
+        "v1.4.50",
         "v1.4.52",
-        "v1.5.15",
+        "v1.5.11",
         "v1.5.17"
       ]
     },
     {
       "downloadURL": "mcr.microsoft.com/containernetworking/cni-dropgz:*",
       "amd64OnlyVersions": [],
       "multiArchVersions": [
-        "v0.0.4.2",
+        "v0.0.4.1",
+        "v0.0.15",
         "v0.1.1"
       ],
       "prefetchOptimizations": [
-        {
-          "version": "v0.0.4.2",
-          "binaries": [
-            "dropgz"
-          ]
-        },
         {
           "version": "v0.1.1",
           "binaries": [
@@ -366,17 +361,17 @@
       "downloadLocation": "/opt/cni/downloads",
       "downloadURL": "https://acs-mirror.azureedge.net/azure-cni/v*/binaries",
       "versions": [
-        "1.4.51",
-        "1.5.15"
+        "1.4.43.1",
+        "1.5.11"
       ]
     },
     {
       "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.51",
-        "1.5.15"
+        "1.5.11",
+        "1.4.43.1"
       ]
     },
     {

diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1
@@ -109,10 +109,10 @@ $global:imagesToPull += @(
     # OMS-Agent (Azure monitor). Owner: ganga1980 (Ganga Mahesh Siddem)
     "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.1.17",
     # CNS (Container Networking Service) Owner: jaer-tsun (Jaeryn)
-    "mcr.microsoft.com/containernetworking/azure-cns:v1.4.51",
     "mcr.microsoft.com/containernetworking/azure-cns:v1.4.52",
-    "mcr.microsoft.com/containernetworking/azure-cns:v1.5.15",
+    "mcr.microsoft.com/containernetworking/azure-cns:v1.4.50",
     "mcr.microsoft.com/containernetworking/azure-cns:v1.5.17",
+    "mcr.microsoft.com/containernetworking/azure-cns:v1.5.11"
     # Dropgz (init container to CNS). Owner: pjohnst5 (Paul Johnston)
     "mcr.microsoft.com/containernetworking/cni-dropgz:v0.0.13"
 )

diff --git a/vhdbuilder/packer/install-dependencies.sh b/vhdbuilder/packer/install-dependencies.sh
@@ -300,8 +300,8 @@ unpackAzureCNI() {
 
 #must be both amd64/arm64 images
 VNET_CNI_VERSIONS="
-1.4.51
-1.5.15
+1.5.11
+1.4.43.1
 "
 
 
@@ -315,8 +315,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.4.51
-1.5.15
+1.5.11
+1.4.43.1
 "
 
 for SWIFT_CNI_VERSION in $SWIFT_CNI_VERSIONS; do