From a6d810a3f94806acd50e25460307103957a28803 Mon Sep 17 00:00:00 2001
From: QxBytes <alexanderlew@microsoft.com>
Date: Tue, 17 Sep 2024 14:59:22 -0700
Subject: [PATCH] chore: update cni and cns to 1.6.7

---
 .../cloud-init/artifacts/components.json      | 19 ++++++++++---------
 .../cloud-init/artifacts/cse_helpers_spec.sh  |  2 +-
 .../generate-windows-vhd-configuration.ps1    |  2 ++
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/parts/linux/cloud-init/artifacts/components.json b/parts/linux/cloud-init/artifacts/components.json
index 288a0af8989..a1b6594ecf7 100644
--- a/parts/linux/cloud-init/artifacts/components.json
+++ b/parts/linux/cloud-init/artifacts/components.json
@@ -69,13 +69,13 @@
           ]
         },
         {
-          "version": "v1.6.0",
+          "version": "v1.6.5",
           "binaries": [
             "dropgz"
           ]
         },
         {
-          "version": "v1.6.5",
+          "version": "v1.6.7",
           "binaries": [
             "dropgz"
           ]
@@ -89,8 +89,8 @@
         },
         {
           "renovateTag": "registry=https://mcr.microsoft.com, name=containernetworking/azure-cni",
-          "latestVersion": "v1.6.5",
-          "previousLatestVersion": "v1.6.0"
+          "latestVersion": "v1.6.7",
+          "previousLatestVersion": "v1.6.5"
         }
       ]
     },
@@ -109,8 +109,8 @@
         },
         {
           "renovateTag": "registry=https://mcr.microsoft.com, name=containernetworking/azure-cns",
-          "latestVersion": "v1.6.5",
-          "previousLatestVersion": "v1.6.0"
+          "latestVersion": "v1.6.7",
+          "previousLatestVersion": "v1.6.5"
         }
       ],
       "prefetchOptimizations": [
@@ -127,13 +127,13 @@
           ]
         },
         {
-          "version": "v1.6.0",
+          "version": "v1.6.5",
           "binaries": [
             "usr/local/bin/azure-cns"
           ]
         },
         {
-          "version": "v1.6.5",
+          "version": "v1.6.7",
           "binaries": [
             "usr/local/bin/azure-cns"
           ]
@@ -740,7 +740,8 @@
               },
               {
                 "renovateTag": "<DO_NOT_UPDATE>",
-                "latestVersion": "1.6.3"
+                "latestVersion": "1.6.7",
+                "previousLatestVersion": "1.6.3"
               }
             ],
             "downloadURL": "https://acs-mirror.azureedge.net/azure-cni/v${version}/binaries/azure-vnet-cni-linux-${CPU_ARCH}-v${version}.tgz"
diff --git a/spec/parts/linux/cloud-init/artifacts/cse_helpers_spec.sh b/spec/parts/linux/cloud-init/artifacts/cse_helpers_spec.sh
index 8898e37cef0..453d66049de 100644
--- a/spec/parts/linux/cloud-init/artifacts/cse_helpers_spec.sh
+++ b/spec/parts/linux/cloud-init/artifacts/cse_helpers_spec.sh
@@ -111,4 +111,4 @@ Describe 'cse_helpers.sh'
             The variable MULTI_ARCH_VERSIONS[@] should equal "dummyVersion3 dummyVersion4 dummyVersion5"
         End
     End
-End
\ No newline at end of file
+End
diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1
index cf924267e5d..9783b4058ce 100644
--- a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1
+++ b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1
@@ -115,11 +115,13 @@ $global:imagesToPull += @(
     "mcr.microsoft.com/containernetworking/azure-cns:v1.4.52",
     "mcr.microsoft.com/containernetworking/azure-cns:v1.5.35",
     "mcr.microsoft.com/containernetworking/azure-cns:v1.6.5",
+    "mcr.microsoft.com/containernetworking/azure-cns:v1.6.7",
     # CNI installer for azure-vnet. Owner: evanbaker
     "mcr.microsoft.com/containernetworking/cni-dropgz:v0.1.4",
     "mcr.microsoft.com/containernetworking/cni-dropgz:v0.2.0",
     "mcr.microsoft.com/containernetworking/azure-cni:v1.5.35",
     "mcr.microsoft.com/containernetworking/azure-cni:v1.6.5"
+    "mcr.microsoft.com/containernetworking/azure-cni:v1.6.7",
 )
 
 $global:map = @{