add azure-cni image for backport to k8s 1.27

Signed-off-by: Evan Baker <[email protected]>
Azure · Oct 11, 2024 · 9f54d52 · 9f54d52
1 parent 66af1d0
commit 9f54d52
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 14 deletions.
diff --git a/parts/linux/cloud-init/artifacts/components.json b/parts/linux/cloud-init/artifacts/components.json
@@ -46,6 +46,22 @@
       "downloadURL": "mcr.microsoft.com/containernetworking/azure-cni:*",
       "amd64OnlyVersions": [],
       "multiArchVersionsV2": [
+        {
+          "renovateTag": "registry=https://mcr.microsoft.com, name=containernetworking/azure-cni",
+          "latestVersion": "v1.4.56",
+          "containerImagePrefetch": {
+            "latestVersion": {
+              "binaries": [
+                "/dropgz"
+              ]
+            },
+            "previousLatestVersion": {
+              "binaries": [
+                "/dropgz"
+              ]
+            }
+          }
+        },
         {
           "renovateTag": "registry=https://mcr.microsoft.com, name=containernetworking/azure-cni",
           "latestVersion": "v1.5.35",
@@ -147,13 +163,7 @@
               ]
             }
           }
-        }
-      ]
-    },
-    {
-      "downloadURL": "mcr.microsoft.com/containernetworking/azure-ipam:*",
-      "amd64OnlyVersions": [],
-      "multiArchVersionsV2": [
+        },
         {
           "renovateTag": "registry=https://mcr.microsoft.com, name=containernetworking/azure-ipam",
           "latestVersion": "v0.2.0",

diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1
@@ -129,6 +129,7 @@ $global:imagesToPull += @(
     "mcr.microsoft.com/containernetworking/azure-cns:v1.6.7",
     "mcr.microsoft.com/containernetworking/azure-cns:v1.6.13",
     # CNI installer for azure-vnet. Owner: evanbaker
+    "mcr.microsoft.com/containernetworking/azure-cni:v1.4.56",
     "mcr.microsoft.com/containernetworking/azure-cni:v1.5.35",
     "mcr.microsoft.com/containernetworking/azure-cni:v1.6.7",
     "mcr.microsoft.com/containernetworking/azure-cni:v1.6.10"

diff --git a/vhdbuilder/prefetch/internal/containerimage/testdata/components.json b/vhdbuilder/prefetch/internal/containerimage/testdata/components.json
@@ -46,6 +46,22 @@
       "downloadURL": "mcr.microsoft.com/containernetworking/azure-cni:*",
       "amd64OnlyVersions": [],
       "multiArchVersionsV2": [
+        {
+          "renovateTag": "registry=https://mcr.microsoft.com, name=containernetworking/azure-cni",
+          "latestVersion": "v1.4.56",
+          "containerImagePrefetch": {
+            "latestVersion": {
+              "binaries": [
+                "/dropgz"
+              ]
+            },
+            "previousLatestVersion": {
+              "binaries": [
+                "/dropgz"
+              ]
+            }
+          }
+        },
         {
           "renovateTag": "registry=https://mcr.microsoft.com, name=containernetworking/azure-cni",
           "latestVersion": "v1.5.35",
@@ -147,13 +163,7 @@
               ]
             }
           }
-        }
-      ]
-    },
-    {
-      "downloadURL": "mcr.microsoft.com/containernetworking/azure-ipam:*",
-      "amd64OnlyVersions": [],
-      "multiArchVersionsV2": [
+        },
         {
           "renovateTag": "registry=https://mcr.microsoft.com, name=containernetworking/azure-ipam",
           "latestVersion": "v0.2.0",

diff --git a/vhdbuilder/prefetch/internal/containerimage/testdata/prefetch.sh b/vhdbuilder/prefetch/internal/containerimage/testdata/prefetch.sh
@@ -17,6 +17,7 @@ prefetch() {
 
     ctr -n k8s.io images unmount "$mount_dir"
 }
+prefetch "mcr.microsoft.com/containernetworking/azure-cni:v1.4.56" "/dropgz"
 prefetch "mcr.microsoft.com/containernetworking/azure-cni:v1.5.35" "/dropgz"
 prefetch "mcr.microsoft.com/containernetworking/azure-cni:v1.5.32" "/dropgz"
 prefetch "mcr.microsoft.com/containernetworking/azure-cni:v1.6.10" "/dropgz"