From a6c56a6842b1573e7a114146ddc24221a05d4229 Mon Sep 17 00:00:00 2001
From: Evan Baker <rbtr@users.noreply.github.com>
Date: Fri, 11 Oct 2024 14:59:14 +0000
Subject: [PATCH] add azure-ipam/azure-cni backport for k8s 1.27

Signed-off-by: Evan Baker <rbtr@users.noreply.github.com>
---
 .../cloud-init/artifacts/components.json      | 22 +++++++++++++++++++
 .../generate-windows-vhd-configuration.ps1    |  1 +
 .../containerimage/testdata/prefetch.sh       |  4 +++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/parts/linux/cloud-init/artifacts/components.json b/parts/linux/cloud-init/artifacts/components.json
index 6b035d3e4ca..78ca3f3196a 100644
--- a/parts/linux/cloud-init/artifacts/components.json
+++ b/parts/linux/cloud-init/artifacts/components.json
@@ -36,6 +36,17 @@
       "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"
+              ]
+            }
+          }
+        },
         {
           "renovateTag": "registry=https://mcr.microsoft.com, name=containernetworking/azure-cni",
           "latestVersion": "v1.5.35",
@@ -127,6 +138,17 @@
       "downloadURL": "mcr.microsoft.com/containernetworking/azure-ipam:*",
       "amd64OnlyVersions": [],
       "multiArchVersionsV2": [
+        {
+          "renovateTag": "registry=https://mcr.microsoft.com, name=containernetworking/azure-ipam",
+          "latestVersion": "v0.0.7",
+          "containerImagePrefetch": {
+            "latestVersion": {
+              "binaries": [
+                "/dropgz"
+              ]
+            }
+          }
+        },
         {
           "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
index bb6693e2aca..481fd382b63 100644
--- a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1
+++ b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1
@@ -131,6 +131,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.13"
diff --git a/vhdbuilder/prefetch/internal/containerimage/testdata/prefetch.sh b/vhdbuilder/prefetch/internal/containerimage/testdata/prefetch.sh
index af95e0cbb5c..e4368654b33 100755
--- 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.13" "/dropgz"
@@ -26,5 +27,6 @@ prefetch "mcr.microsoft.com/containernetworking/azure-cns:v1.5.35" "/usr/local/b
 prefetch "mcr.microsoft.com/containernetworking/azure-cns:v1.5.32" "/usr/local/bin/azure-cns"
 prefetch "mcr.microsoft.com/containernetworking/azure-cns:v1.6.13" "/usr/local/bin/azure-cns"
 prefetch "mcr.microsoft.com/containernetworking/azure-cns:v1.6.7" "/usr/local/bin/azure-cns"
+prefetch "mcr.microsoft.com/containernetworking/azure-ipam:v0.0.7" "/dropgz"
 prefetch "mcr.microsoft.com/containernetworking/azure-ipam:v0.2.0" "/dropgz"
-prefetch "mcr.microsoft.com/containernetworking/cni-dropgz:v0.0.20" "/dropgz"
\ No newline at end of file
+prefetch "mcr.microsoft.com/containernetworking/cni-dropgz:v0.0.20" "/dropgz"