From 2bd5fcfac05eca9704829a4fea7a15ce87734bb2 Mon Sep 17 00:00:00 2001
From: Evan Baker <rbtr@users.noreply.github.com>
Date: Mon, 8 Apr 2024 21:56:26 +0000
Subject: [PATCH] chore: cache azure-cni and azure-ipam

Signed-off-by: Evan Baker <rbtr@users.noreply.github.com>
---
 .../cloud-init/artifacts/components.json      | 41 ++++++++++++++-----
 pkg/agent/vhd/cache/cache_test.go             |  4 +-
 .../generate-windows-vhd-configuration.ps1    |  4 +-
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/parts/linux/cloud-init/artifacts/components.json b/parts/linux/cloud-init/artifacts/components.json
index b3e466128b0..4d07622842e 100644
--- a/parts/linux/cloud-init/artifacts/components.json
+++ b/parts/linux/cloud-init/artifacts/components.json
@@ -36,12 +36,26 @@
         "1.35"
       ]
     },
+    {
+      "downloadURL": "mcr.microsoft.com/containernetworking/azure-cni:*",
+      "amd64OnlyVersions": [],
+      "multiArchVersions": [
+        "v1.5.28"
+      ],
+      "prefetchOptimizations": [
+        {
+          "version": "v1.5.28",
+          "binaries": [
+            "dropgz"
+          ]
+        }
+      ]
+    },
     {
       "downloadURL": "mcr.microsoft.com/containernetworking/azure-cns:*",
       "amd64OnlyVersions": [],
       "multiArchVersions": [
         "v1.4.52",
-        "v1.5.23",
         "v1.5.26"
       ],
       "prefetchOptimizations": [
@@ -60,24 +74,31 @@
       ]
     },
     {
-      "downloadURL": "mcr.microsoft.com/containernetworking/cni-dropgz:*",
+      "downloadURL": "mcr.microsoft.com/containernetworking/azure-ipam:*",
       "amd64OnlyVersions": [],
       "multiArchVersions": [
-        "v0.0.15",
-        "v0.1.3",
-        "v0.0.20",
-        "v0.1.4",
-        "v0.0.4.1"
+        "v0.2.0"
       ],
       "prefetchOptimizations": [
         {
-          "version": "v0.0.15",
+          "version": "v0.2.0",
           "binaries": [
             "dropgz"
           ]
-        },
+        }
+      ]
+    },
+    {
+      "downloadURL": "mcr.microsoft.com/containernetworking/cni-dropgz:*",
+      "amd64OnlyVersions": [],
+      "multiArchVersions": [
+        "v0.0.13",
+        "v0.0.20",
+        "v0.1.4"
+      ],
+      "prefetchOptimizations": [
         {
-          "version": "v0.1.3",
+          "version": "v0.0.13",
           "binaries": [
             "dropgz"
           ]
diff --git a/pkg/agent/vhd/cache/cache_test.go b/pkg/agent/vhd/cache/cache_test.go
index 484bfde9e40..f03169b2273 100644
--- a/pkg/agent/vhd/cache/cache_test.go
+++ b/pkg/agent/vhd/cache/cache_test.go
@@ -8,7 +8,7 @@ import (
 var _ = Describe("cache suite", func() {
 	Context("get cached data", func() {
 		It("should have the correct manifest and components data cached", func() {
-			//TODO: improve test logic
+			// TODO: improve test logic
 			manifest, err := getManifest()
 			Expect(err).NotTo(HaveOccurred())
 
@@ -18,7 +18,7 @@ var _ = Describe("cache suite", func() {
 			// The indices are hardcoded based on the current components.json.
 			// Add new components to the bottom of components.json, or update the indices.
 			pauseIndx := 2
-			azureCNSIndx := 5
+			azureCNSIndx := 6
 			cniPluginIndx := 0
 			azureCNIIndx := 1
 
diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1
index 51b9a3b4ec3..c42498f238a 100644
--- a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1
+++ b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1
@@ -107,9 +107,9 @@ $global:imagesToPull += @(
     # CNS (Container Networking Service) Owner: jaer-tsun (Jaeryn)
     "mcr.microsoft.com/containernetworking/azure-cns:v1.4.52",
     "mcr.microsoft.com/containernetworking/azure-cns:v1.5.26",
-    # Dropgz (init container to CNS). Owner: pjohnst5 (Paul Johnston)
-    "mcr.microsoft.com/containernetworking/cni-dropgz:v0.1.3"
+    # CNI installer for azure-vnet. Owner: evanbaker
     "mcr.microsoft.com/containernetworking/cni-dropgz:v0.1.4"
+    "mcr.microsoft.com/containernetworking/azure-cni:v1.5.26"
 )
 
 $global:map = @{