From 2fcd604872435ab3996e78a376ac544a1ca1ae56 Mon Sep 17 00:00:00 2001
From: Fan Shang Xiang <shafan@microsoft.com>
Date: Mon, 17 Feb 2025 14:41:31 +0800
Subject: [PATCH] add auto bump for linux windows credential provider

---
 parts/common/components.json                     | 16 ++++++++++++++--
 .../windows/components_json_helpers.tests.ps1    |  6 ------
 .../packer/windows/windows-vhd-configuration.ps1 |  3 +--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/parts/common/components.json b/parts/common/components.json
index f9aa47eb7c7..120ac702009 100644
--- a/parts/common/components.json
+++ b/parts/common/components.json
@@ -868,8 +868,15 @@
             "versionsV2": [
               {
                 "renovateTag": "<DO_NOT_UPDATE>",
-                "latestVersion": "1.29.2",
-                "previousLatestVersion": "1.30.0"
+                "latestVersion": "1.31.2"
+              },
+              {
+                "renovateTag": "<DO_NOT_UPDATE>",
+                "latestVersion": "1.30.8"
+              },
+              {
+                "renovateTag": "<DO_NOT_UPDATE>",
+                "latestVersion": "1.29.12"
               }
             ],
             "downloadURL": "https://acs-mirror.azureedge.net/cloud-provider-azure/v[version]/binaries/azure-acr-credential-provider-windows-amd64-v[version].tar.gz"
@@ -1264,6 +1271,11 @@
         "default": {
           "current": {
             "versionsV2": [
+              {
+                "k8sVersion": "1.31",
+                "renovateTag": "OCI_registry=https://mcr.microsoft.com, name=oss/binaries/kubernetes/azure-acr-credential-provider",
+                "latestVersion": "v1.31.2"
+              },
               {
                 "k8sVersion": "1.30",
                 "renovateTag": "OCI_registry=https://mcr.microsoft.com, name=oss/binaries/kubernetes/azure-acr-credential-provider",
diff --git a/vhdbuilder/packer/windows/components_json_helpers.tests.ps1 b/vhdbuilder/packer/windows/components_json_helpers.tests.ps1
index d9a6445f5dd..901dea35dbd 100644
--- a/vhdbuilder/packer/windows/components_json_helpers.tests.ps1
+++ b/vhdbuilder/packer/windows/components_json_helpers.tests.ps1
@@ -715,12 +715,6 @@ Describe 'Tests of components.json ' {
         $packages["c:\akse-cache\csi-proxy\"] | Should -Contain "https://acs-mirror.azureedge.net/csi-proxy/v1.1.2-hotfix.20230807/binaries/csi-proxy-v1.1.2-hotfix.20230807.tar.gz"
     }
 
-    it 'has credential provider' {
-        $packages = GetPackagesFromComponentsJson $componentsJson
-        $packages["c:\akse-cache\credential-provider\"] | Should -Contain "https://acs-mirror.azureedge.net/cloud-provider-azure/v1.29.2/binaries/azure-acr-credential-provider-windows-amd64-v1.29.2.tar.gz"
-        $packages["c:\akse-cache\credential-provider\"] | Should -Contain "https://acs-mirror.azureedge.net/cloud-provider-azure/v1.30.0/binaries/azure-acr-credential-provider-windows-amd64-v1.30.0.tar.gz"
-    }
-
     it 'has calico' {
         $packages = GetPackagesFromComponentsJson $componentsJson
         $packages["c:\akse-cache\calico\"] | Should -Contain "https://acs-mirror.azureedge.net/calico-node/v3.24.0/binaries/calico-windows-v3.24.0.zip"
diff --git a/vhdbuilder/packer/windows/windows-vhd-configuration.ps1 b/vhdbuilder/packer/windows/windows-vhd-configuration.ps1
index dfc9fd45924..c321bbe436e 100644
--- a/vhdbuilder/packer/windows/windows-vhd-configuration.ps1
+++ b/vhdbuilder/packer/windows/windows-vhd-configuration.ps1
@@ -76,7 +76,6 @@ $global:excludeHashComparisionListInAzureChinaCloud = @(
     "azure-vnet-cni-singletenancy-overlay-windows-amd64",
     # We need upstream's help to republish this package. Before that, it does not impact functionality and 1.26 is only in public preview
     # so we can ignore the different hash values.
-    "v1.26.0-1int.zip",
-    "azure-acr-credential-provider-windows-amd64-v1.29.2.tar.gz"
+    "v1.26.0-1int.zip"
 )