Skip to content

fix: stop SIG image-version GC from deleting every untagged version (backport of #9397) - #9399

Open
Ganeshkumar Ashokavardhanan (ganeshkumarashok) wants to merge 1 commit into
ganesh/gb-may-packagekitfrom
ganesh/gb-may-sig-gc-fix
Open

fix: stop SIG image-version GC from deleting every untagged version (backport of #9397)#9399
Ganeshkumar Ashokavardhanan (ganeshkumarashok) wants to merge 1 commit into
ganesh/gb-may-packagekitfrom
ganesh/gb-may-sig-gc-fix

Conversation

@ganeshkumarashok

@ganeshkumarashok Ganeshkumar Ashokavardhanan (ganeshkumarashok) commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

Backport of #9397 onto the GB200/300 May build branch.

Why this needs to be on this branch, not just main

ADO build 179633029 ran off ganesh/gb-may-packagekit — this branch — and deleted 39 SIG image versions, including 2404gen2arm64gbcontainerd 1.2.103–1.2.106.

vhdbuilder/packer/cleanup.sh here is byte-identical to main's, so the bug is live on this branch too. Until this merges, every VHD build queued off this branch (or off ganesh/gb-may-go127-pin, which stacks on it) will run the same destructive GC again — including a failed one, because a failed build still runs cleanup:

Build step did not produce an image version. Running cleanup and then exiting.

The two defects

1. The age filter is unconditionally true.

jq --arg dl $deadline '.[] | select(.tags.now < $dl).name'

SIG image versions never carry a now tag. Packer applies azure_tags (the source of now) to the managed image; the shared_image_gallery_destination block has no tags. So .tags.now is null for every version — and in jq:

$ jq -n '(null < "1787873664")'
true

null sorts below every string, so the filter always matches. "Delete versions older than 168 hours" actually means delete the first 15 versions of every image definition on every linuxVhdMode build, regardless of age. Only the az lock list check limited the damage.

The adjacent managed-image loop already guards this (select(.tags.now != null), line 148) and managed images genuinely are tagged — so that loop is correct and is left untouched.

2. The GB exemption was dead code.

if [ "${image_definition,,}" = "2404gen2arm64gbcontainerd" ] && [[ "$image_version" == "1.1."* ]]; then

GB builds moved to 1.2.x, so the 1.1. clause silently stopped protecting anything. That is exactly why 1.2.103–1.2.106 were collected.

The fix

Age SIG versions off the ARM-provided publishingProfile.publishedDate (ISO-8601 UTC, so it sorts lexicographically) with a != null guard, and match the GB exemption on the image definition alone.

This is the pattern already used in-repo by .pipelines/scripts/windows-sub-cleanup.sh:105.

version published before after
1.2.999 today DELETED ← bug kept
1.2.103 2026-05-28 DELETED exempt (GB)
stale non-GB > 7d ago deleted deleted (unchanged)

Verification

  • cleanup.sh on this branch is byte-identical to main's before the change, and the resulting file is byte-identical to fix: stop SIG image-version GC from deleting every untagged version #9397's.
  • .pipelines/scripts/verify_shell.sh is identical on this branch and main.
  • bash -n clean; shellcheck run exactly as CI invokes it (bash mode via shebang + the repo ignore list) exits 0, no new findings. The now-unnecessary # shellcheck disable=SC3010 is dropped along with the [[ ]].
  • jq fixture confirms a version published today is selected for deletion before the change and skipped after.

Once this and #9392 (Go 1.26.7 pin) are in, a GB VHD build off this branch is safe to queue.

@ganeshkumarashok
fix: stop SIG image-version GC from deleting every untagged version
14e9777 
vhdbuilder/packer/cleanup.sh ages off SIG image versions with

    jq --arg dl $deadline '.[] | select(.tags.now < $dl).name'

but SIG image versions never carry a "now" tag. Packer applies azure_tags
to the managed image only; the shared_image_gallery_destination block has
no tags. So .tags.now is null for every version, and in jq null compares
less than any string, making the filter unconditionally true.

The result is that the "delete versions older than 168 hours" pass really
deletes the first 15 versions of every image definition in the gallery on
every linuxVhdMode build, regardless of age, including versions created
minutes earlier. Only the resource-lock check limited the damage.

The adjacent managed-image loop already guards with select(.tags.now !=
null) -- and managed images genuinely do carry the tag, so that loop is
correct. windows-sub-cleanup.sh already ages SIG versions off
publishingProfile.publishedDate. This aligns cleanup.sh with both.

Also fix the 2404gen2arm64gbcontainerd exemption, which additionally
required the version to start with "1.1.". GB builds moved to 1.2.x, so
the exemption silently stopped protecting anything and versions
1.2.103-1.2.106 were collected. It now matches the image definition.

Observed in ADO build 179633029, where a failed AzureLinuxV3gen1 build
ran cleanup and deleted 39 SIG versions across 2404gen2arm64gbcontainerd,
flatcargen2, flatcargen2arm64 and five Windows definitions.

(cherry picked from commit 3781e5e)
@github-actions

github-actions Bot commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

Changes cached containers or packages on windows VHDs

Please get a Windows SIG member to approve.

The following dif file shows any additions or deletions from what will be cached on windows VHDs organised by VHD type.

  • Additions are new things cached.
  • Deletions are things no longer cached.
diff --git a/vhd_files/2022-containerd-gen2.txt b/vhd_files/2022-containerd-gen2.txt
index 4e05767..dddb312 100644
--- a/vhd_files/2022-containerd-gen2.txt
+++ b/vhd_files/2022-containerd-gen2.txt
@@ -1 +1 @@
-c:\aks-tools\oras\: https://github.com/oras-project/oras/releases/download/v1.3.3/oras_1.3.3_windows_amd64.zip
+c:\aks-tools\oras\: https://github.com/oras-project/oras/releases/download/v1.3.0/oras_1.3.0_windows_amd64.zip
@@ -4 +4 @@ c:\akse-cache\: https://packages.aks.azure.com/ccgakvplugin/v1.1.5/binaries/wind
-c:\akse-cache\aks-secure-tls-bootstrap-client\: https://github.com/Azure/aks-secure-tls-bootstrap/releases/download/client/v1.1.4/windows-amd64.zip
+c:\akse-cache\aks-secure-tls-bootstrap-client\: https://github.com/Azure/aks-secure-tls-bootstrap/releases/download/client/v1.1.2/windows-amd64.zip
@@ -27,0 +28 @@ c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.32.12/windo
+c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.33.10/windowszip/v1.33.10-1int.zip
@@ -29 +30 @@ c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.33.11/windo
-c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.33.13/windowszip/v1.33.13-1int.zip
+c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.34.4/windowszip/v1.34.4-1int.zip
@@ -31 +31,0 @@ c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.34.7/window
-c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.34.9/windowszip/v1.34.9-1int.zip
@@ -104,0 +105 @@ HKLM:\SYSTEM\CurrentControlSet\Services\VfpExt\Parameters\VfpNotReuseTcpOneWayFl
+mcr.microsoft.com/containernetworking/azure-cni:v1.5.50
@@ -106,0 +108,2 @@ mcr.microsoft.com/containernetworking/azure-cni:v1.7.16-0
+mcr.microsoft.com/containernetworking/azure-cni:v1.8.6-0
+mcr.microsoft.com/containernetworking/azure-cns:v1.5.50
@@ -109,3 +112,3 @@ mcr.microsoft.com/containernetworking/azure-cns:v1.7.16-0
-mcr.microsoft.com/containernetworking/v2/azure-cni:v1.8.12
-mcr.microsoft.com/containernetworking/v2/azure-cns:v1.8.12
-mcr.microsoft.com/oss/v2/azure/secrets-store/provider-azure:v1.8.2-6
+mcr.microsoft.com/containernetworking/azure-cns:v1.8.6-0
+mcr.microsoft.com/oss/kubernetes/pause:3.9-hotfix-20230808
+mcr.microsoft.com/oss/v2/azure/secrets-store/provider-azure:v1.7.2
@@ -113 +116,2 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.33.10-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.33.11-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.33.9-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.34.3-windows-hp
@@ -115 +118,0 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.34.4-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.34.5-windows-hp
@@ -118,4 +121,5 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.33.9-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.7-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.8-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.35.6-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.35.7-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.5-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.6-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.35.2-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.35.3-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.15.0
@@ -123 +127 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.16.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.17.0
+mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.17.0
@@ -125,10 +129,4 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.18.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.19.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/secrets-store/driver:v1.6.0-7
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.33.16-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.33.17-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.34.12-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.34.13-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.35.7-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.35.8-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.36.4-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.36.5-windows-hpc-1
+mcr.microsoft.com/oss/v2/kubernetes-csi/secrets-store/driver:v1.5.4
+mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.33.11-windows-hpc-1
+mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.34.8-windows-hpc-1
+mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.35.3-windows-hpc-1
@@ -136 +133,0 @@ mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1
-mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.2
@@ -138,2 +135,2 @@ mcr.microsoft.com/windows/nanoserver:ltsc2022
-mcr.microsoft.com/windows/servercore:10.0.20348.5386
-mcr.microsoft.com/windows/servercore:10.0.20348.5499
+mcr.microsoft.com/windows/servercore:10.0.20348.5020
+mcr.microsoft.com/windows/servercore:10.0.20348.5139
@@ -145 +142 @@ Windows 2022-containerd-gen2 base image sku: 2022-datacenter-core-smalldisk-g2
-Windows 2022-containerd-gen2 base version: 20348.5499.260809
+Windows 2022-containerd-gen2 base version: 20348.5139.260507
diff --git a/vhd_files/2022-containerd.txt b/vhd_files/2022-containerd.txt
index a8c76d7..df70a07 100644
--- a/vhd_files/2022-containerd.txt
+++ b/vhd_files/2022-containerd.txt
@@ -1 +1 @@
-c:\aks-tools\oras\: https://github.com/oras-project/oras/releases/download/v1.3.3/oras_1.3.3_windows_amd64.zip
+c:\aks-tools\oras\: https://github.com/oras-project/oras/releases/download/v1.3.0/oras_1.3.0_windows_amd64.zip
@@ -4 +4 @@ c:\akse-cache\: https://packages.aks.azure.com/ccgakvplugin/v1.1.5/binaries/wind
-c:\akse-cache\aks-secure-tls-bootstrap-client\: https://github.com/Azure/aks-secure-tls-bootstrap/releases/download/client/v1.1.4/windows-amd64.zip
+c:\akse-cache\aks-secure-tls-bootstrap-client\: https://github.com/Azure/aks-secure-tls-bootstrap/releases/download/client/v1.1.2/windows-amd64.zip
@@ -27,0 +28 @@ c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.32.12/windo
+c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.33.10/windowszip/v1.33.10-1int.zip
@@ -29 +30 @@ c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.33.11/windo
-c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.33.13/windowszip/v1.33.13-1int.zip
+c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.34.4/windowszip/v1.34.4-1int.zip
@@ -31 +31,0 @@ c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.34.7/window
-c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.34.9/windowszip/v1.34.9-1int.zip
@@ -104,0 +105 @@ HKLM:\SYSTEM\CurrentControlSet\Services\VfpExt\Parameters\VfpNotReuseTcpOneWayFl
+mcr.microsoft.com/containernetworking/azure-cni:v1.5.50
@@ -106,0 +108,2 @@ mcr.microsoft.com/containernetworking/azure-cni:v1.7.16-0
+mcr.microsoft.com/containernetworking/azure-cni:v1.8.6-0
+mcr.microsoft.com/containernetworking/azure-cns:v1.5.50
@@ -109,3 +112,3 @@ mcr.microsoft.com/containernetworking/azure-cns:v1.7.16-0
-mcr.microsoft.com/containernetworking/v2/azure-cni:v1.8.12
-mcr.microsoft.com/containernetworking/v2/azure-cns:v1.8.12
-mcr.microsoft.com/oss/v2/azure/secrets-store/provider-azure:v1.8.2-6
+mcr.microsoft.com/containernetworking/azure-cns:v1.8.6-0
+mcr.microsoft.com/oss/kubernetes/pause:3.9-hotfix-20230808
+mcr.microsoft.com/oss/v2/azure/secrets-store/provider-azure:v1.7.2
@@ -113 +116,2 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.33.10-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.33.11-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.33.9-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.34.3-windows-hp
@@ -115 +118,0 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.34.4-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.34.5-windows-hp
@@ -118,4 +121,5 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.33.9-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.7-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.8-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.35.6-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.35.7-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.5-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.6-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.35.2-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.35.3-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.15.0
@@ -123 +127 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.16.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.17.0
+mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.17.0
@@ -125,10 +129,4 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.18.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.19.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/secrets-store/driver:v1.6.0-7
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.33.16-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.33.17-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.34.12-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.34.13-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.35.7-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.35.8-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.36.4-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.36.5-windows-hpc-1
+mcr.microsoft.com/oss/v2/kubernetes-csi/secrets-store/driver:v1.5.4
+mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.33.11-windows-hpc-1
+mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.34.8-windows-hpc-1
+mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.35.3-windows-hpc-1
@@ -136 +133,0 @@ mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1
-mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.2
@@ -138,2 +135,2 @@ mcr.microsoft.com/windows/nanoserver:ltsc2022
-mcr.microsoft.com/windows/servercore:10.0.20348.5386
-mcr.microsoft.com/windows/servercore:10.0.20348.5499
+mcr.microsoft.com/windows/servercore:10.0.20348.5020
+mcr.microsoft.com/windows/servercore:10.0.20348.5139
@@ -145 +142 @@ Windows 2022-containerd base image sku: 2022-Datacenter-Core-smalldisk
-Windows 2022-containerd base version: 20348.5499.260809
+Windows 2022-containerd base version: 20348.5139.260507
diff --git a/vhd_files/2025-gen2.txt b/vhd_files/2025-gen2.txt
index eec1d89..c2acd53 100644
--- a/vhd_files/2025-gen2.txt
+++ b/vhd_files/2025-gen2.txt
@@ -1 +1 @@
-c:\aks-tools\oras\: https://github.com/oras-project/oras/releases/download/v1.3.3/oras_1.3.3_windows_amd64.zip
+c:\aks-tools\oras\: https://github.com/oras-project/oras/releases/download/v1.3.0/oras_1.3.0_windows_amd64.zip
@@ -4 +4 @@ c:\akse-cache\: https://packages.aks.azure.com/ccgakvplugin/v1.1.5/binaries/wind
-c:\akse-cache\aks-secure-tls-bootstrap-client\: https://github.com/Azure/aks-secure-tls-bootstrap/releases/download/client/v1.1.4/windows-amd64.zip
+c:\akse-cache\aks-secure-tls-bootstrap-client\: https://github.com/Azure/aks-secure-tls-bootstrap/releases/download/client/v1.1.2/windows-amd64.zip
@@ -15 +15 @@ c:\akse-cache\csi-proxy\: https://packages.aks.azure.com/csi-proxy/v1.1.2-hotfix
-c:\akse-cache\wcn\: mcr.microsoft.com/wcn/package:1.7.1-cpu-arch
+c:\akse-cache\wcn\: mcr.microsoft.com/wcn/package:1.7.0-cpu-arch
@@ -25,0 +26 @@ c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.32.12/windo
+c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.33.10/windowszip/v1.33.10-1int.zip
@@ -27 +28 @@ c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.33.11/windo
-c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.33.13/windowszip/v1.33.13-1int.zip
+c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.34.4/windowszip/v1.34.4-1int.zip
@@ -29 +29,0 @@ c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.34.7/window
-c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.34.9/windowszip/v1.34.9-1int.zip
@@ -34 +33,0 @@ HKLM:\SYSTEM\CurrentControlSet\Policies\Microsoft\FeatureManagement\Overrides\18
-HKLM:\SYSTEM\CurrentControlSet\Policies\Microsoft\FeatureManagement\Overrides\908168846=1
@@ -35,0 +35 @@ HKLM:\SYSTEM\CurrentControlSet\Services\hns\State\EnableCompartmentNamespace=1
+mcr.microsoft.com/containernetworking/azure-cni:v1.5.50
@@ -37,0 +38,2 @@ mcr.microsoft.com/containernetworking/azure-cni:v1.7.16-0
+mcr.microsoft.com/containernetworking/azure-cni:v1.8.6-0
+mcr.microsoft.com/containernetworking/azure-cns:v1.5.50
@@ -40,3 +42,3 @@ mcr.microsoft.com/containernetworking/azure-cns:v1.7.16-0
-mcr.microsoft.com/containernetworking/v2/azure-cni:v1.8.12
-mcr.microsoft.com/containernetworking/v2/azure-cns:v1.8.12
-mcr.microsoft.com/oss/v2/azure/secrets-store/provider-azure:v1.8.2-6
+mcr.microsoft.com/containernetworking/azure-cns:v1.8.6-0
+mcr.microsoft.com/oss/kubernetes/pause:3.9-hotfix-20230808
+mcr.microsoft.com/oss/v2/azure/secrets-store/provider-azure:v1.7.2
@@ -44 +46,2 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.33.10-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.33.11-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.33.9-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.34.3-windows-hp
@@ -46 +48,0 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.34.4-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.34.5-windows-hp
@@ -49,4 +51,5 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.33.9-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.7-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.8-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.35.6-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.35.7-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.5-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.6-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.35.2-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.35.3-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.15.0
@@ -54 +57 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.16.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.17.0
+mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.17.0
@@ -56,10 +59,4 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.18.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.19.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/secrets-store/driver:v1.6.0-7
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.33.16-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.33.17-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.34.12-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.34.13-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.35.7-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.35.8-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.36.4-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.36.5-windows-hpc-1
+mcr.microsoft.com/oss/v2/kubernetes-csi/secrets-store/driver:v1.5.4
+mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.33.11-windows-hpc-1
+mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.34.8-windows-hpc-1
+mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.35.3-windows-hpc-1
@@ -67 +63,0 @@ mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1
-mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.2
@@ -70,4 +66,4 @@ mcr.microsoft.com/windows/nanoserver:ltsc2025
-mcr.microsoft.com/windows/servercore:10.0.20348.5386
-mcr.microsoft.com/windows/servercore:10.0.20348.5499
-mcr.microsoft.com/windows/servercore:10.0.26100.33158
-mcr.microsoft.com/windows/servercore:10.0.26100.33296
+mcr.microsoft.com/windows/servercore:10.0.20348.5020
+mcr.microsoft.com/windows/servercore:10.0.20348.5139
+mcr.microsoft.com/windows/servercore:10.0.26100.32690
+mcr.microsoft.com/windows/servercore:10.0.26100.32860
@@ -80 +76 @@ Windows 2025-gen2 base image sku: 2025-datacenter-core-smalldisk-g2
-Windows 2025-gen2 base version: 26100.33296.260809
+Windows 2025-gen2 base version: 26100.32860.260510
diff --git a/vhd_files/2025.txt b/vhd_files/2025.txt
index 5997647..f9a181e 100644
--- a/vhd_files/2025.txt
+++ b/vhd_files/2025.txt
@@ -1 +1 @@
-c:\aks-tools\oras\: https://github.com/oras-project/oras/releases/download/v1.3.3/oras_1.3.3_windows_amd64.zip
+c:\aks-tools\oras\: https://github.com/oras-project/oras/releases/download/v1.3.0/oras_1.3.0_windows_amd64.zip
@@ -4 +4 @@ c:\akse-cache\: https://packages.aks.azure.com/ccgakvplugin/v1.1.5/binaries/wind
-c:\akse-cache\aks-secure-tls-bootstrap-client\: https://github.com/Azure/aks-secure-tls-bootstrap/releases/download/client/v1.1.4/windows-amd64.zip
+c:\akse-cache\aks-secure-tls-bootstrap-client\: https://github.com/Azure/aks-secure-tls-bootstrap/releases/download/client/v1.1.2/windows-amd64.zip
@@ -15 +15 @@ c:\akse-cache\csi-proxy\: https://packages.aks.azure.com/csi-proxy/v1.1.2-hotfix
-c:\akse-cache\wcn\: mcr.microsoft.com/wcn/package:1.7.1-cpu-arch
+c:\akse-cache\wcn\: mcr.microsoft.com/wcn/package:1.7.0-cpu-arch
@@ -25,0 +26 @@ c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.32.12/windo
+c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.33.10/windowszip/v1.33.10-1int.zip
@@ -27 +28 @@ c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.33.11/windo
-c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.33.13/windowszip/v1.33.13-1int.zip
+c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.34.4/windowszip/v1.34.4-1int.zip
@@ -29 +29,0 @@ c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.34.7/window
-c:\akse-cache\win-k8s\: https://packages.aks.azure.com/kubernetes/v1.34.9/windowszip/v1.34.9-1int.zip
@@ -34 +33,0 @@ HKLM:\SYSTEM\CurrentControlSet\Policies\Microsoft\FeatureManagement\Overrides\18
-HKLM:\SYSTEM\CurrentControlSet\Policies\Microsoft\FeatureManagement\Overrides\908168846=1
@@ -35,0 +35 @@ HKLM:\SYSTEM\CurrentControlSet\Services\hns\State\EnableCompartmentNamespace=1
+mcr.microsoft.com/containernetworking/azure-cni:v1.5.50
@@ -37,0 +38,2 @@ mcr.microsoft.com/containernetworking/azure-cni:v1.7.16-0
+mcr.microsoft.com/containernetworking/azure-cni:v1.8.6-0
+mcr.microsoft.com/containernetworking/azure-cns:v1.5.50
@@ -40,3 +42,3 @@ mcr.microsoft.com/containernetworking/azure-cns:v1.7.16-0
-mcr.microsoft.com/containernetworking/v2/azure-cni:v1.8.12
-mcr.microsoft.com/containernetworking/v2/azure-cns:v1.8.12
-mcr.microsoft.com/oss/v2/azure/secrets-store/provider-azure:v1.8.2-6
+mcr.microsoft.com/containernetworking/azure-cns:v1.8.6-0
+mcr.microsoft.com/oss/kubernetes/pause:3.9-hotfix-20230808
+mcr.microsoft.com/oss/v2/azure/secrets-store/provider-azure:v1.7.2
@@ -44 +46,2 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.33.10-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.33.11-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.33.9-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.34.3-windows-hp
@@ -46 +48,0 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.34.4-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.34.5-windows-hp
@@ -49,4 +51,5 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.33.9-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.7-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.8-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.35.6-windows-hp
-mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.35.7-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.5-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.6-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.35.2-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.35.3-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.15.0
@@ -54 +57 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.16.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.17.0
+mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.17.0
@@ -56,10 +59,4 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.18.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.19.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/secrets-store/driver:v1.6.0-7
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.33.16-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.33.17-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.34.12-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.34.13-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.35.7-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.35.8-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.36.4-windows-hpc-1
-mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.36.5-windows-hpc-1
+mcr.microsoft.com/oss/v2/kubernetes-csi/secrets-store/driver:v1.5.4
+mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.33.11-windows-hpc-1
+mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.34.8-windows-hpc-1
+mcr.microsoft.com/oss/v2/kubernetes/azure-cloud-node-manager:v1.35.3-windows-hpc-1
@@ -67 +63,0 @@ mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1
-mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.2
@@ -70,4 +66,4 @@ mcr.microsoft.com/windows/nanoserver:ltsc2025
-mcr.microsoft.com/windows/servercore:10.0.20348.5386
-mcr.microsoft.com/windows/servercore:10.0.20348.5499
-mcr.microsoft.com/windows/servercore:10.0.26100.33158
-mcr.microsoft.com/windows/servercore:10.0.26100.33296
+mcr.microsoft.com/windows/servercore:10.0.20348.5020
+mcr.microsoft.com/windows/servercore:10.0.20348.5139
+mcr.microsoft.com/windows/servercore:10.0.26100.32690
+mcr.microsoft.com/windows/servercore:10.0.26100.32860
@@ -80 +76 @@ Windows 2025 base image sku: 2025-datacenter-core-smalldisk
-Windows 2025 base version: 26100.33296.260809
+Windows 2025 base version: 26100.32860.260510

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cameronmeissner Cameron Meissner (cameronmeissner) Awaiting requested review from cameronmeissner cameronmeissner is a code owner
@Devinwong Devinwong Awaiting requested review from Devinwong Devinwong is a code owner
@lilypan26 lilypan26 Awaiting requested review from lilypan26 lilypan26 is a code owner
@AbelHu Chou Hu (AbelHu) Awaiting requested review from AbelHu AbelHu is a code owner
@djsly Sylvain Boily (djsly) Awaiting requested review from djsly djsly is a code owner
@phealy Patrick W. Healy (phealy) Awaiting requested review from phealy phealy is a code owner
@r2k1 r2k1 Awaiting requested review from r2k1 r2k1 is a code owner
@timmy-wright Tim Wright (timmy-wright) Awaiting requested review from timmy-wright timmy-wright is a code owner
@zachary-bailey Zachary (zachary-bailey) Awaiting requested review from zachary-bailey zachary-bailey is a code owner
@awesomenix Nishchay (awesomenix) Awaiting requested review from awesomenix awesomenix is a code owner
@mxj220 Mark Ibrahim (mxj220) Awaiting requested review from mxj220 mxj220 is a code owner
@pdamianov-dev Peter Damianov (pdamianov-dev) Awaiting requested review from pdamianov-dev pdamianov-dev is a code owner
@calvin197 Calvin S. (calvin197) Awaiting requested review from calvin197 calvin197 is a code owner
@sulixu sulixu Awaiting requested review from sulixu sulixu is a code owner
@SriHarsha001 Sri Harsha (SriHarsha001) Awaiting requested review from SriHarsha001 SriHarsha001 is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@ganeshkumarashok