cherry-pick: fix: adjust retries and timeout given to apt-mark hold walinuxagent command during provisioning

[cameronmeissner]

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

[github-actions]

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 9b3f85b..0cc1903 100644
--- a/vhd_files/2022-containerd-gen2.txt
+++ b/vhd_files/2022-containerd-gen2.txt
@@ -3 +3 @@ 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.0.2/windows-amd64.zip
+c:\akse-cache\aks-secure-tls-bootstrap-client\: https://github.com/Azure/aks-secure-tls-bootstrap/releases/download/client/v1.0.1/windows-amd64.zip
@@ -123,0 +124 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.3-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.14.0
@@ -125 +126 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.15.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.16.0
+mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.16.0
@@ -127 +127,0 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.17.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.18.0
diff --git a/vhd_files/2022-containerd.txt b/vhd_files/2022-containerd.txt
index 3e69016..aefde73 100644
--- a/vhd_files/2022-containerd.txt
+++ b/vhd_files/2022-containerd.txt
@@ -3 +3 @@ 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.0.2/windows-amd64.zip
+c:\akse-cache\aks-secure-tls-bootstrap-client\: https://github.com/Azure/aks-secure-tls-bootstrap/releases/download/client/v1.0.1/windows-amd64.zip
@@ -123,0 +124 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.3-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.14.0
@@ -125 +126 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.15.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.16.0
+mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.16.0
@@ -127 +127,0 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.17.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.18.0
diff --git a/vhd_files/2025-gen2.txt b/vhd_files/2025-gen2.txt
index dfbde77..138df42 100644
--- a/vhd_files/2025-gen2.txt
+++ b/vhd_files/2025-gen2.txt
@@ -3 +3 @@ 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.0.2/windows-amd64.zip
+c:\akse-cache\aks-secure-tls-bootstrap-client\: https://github.com/Azure/aks-secure-tls-bootstrap/releases/download/client/v1.0.1/windows-amd64.zip
@@ -53,0 +54 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.3-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.14.0
@@ -55 +56 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.15.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.16.0
+mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.16.0
@@ -57 +57,0 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.17.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.18.0
diff --git a/vhd_files/2025.txt b/vhd_files/2025.txt
index e855749..2a2bcad 100644
--- a/vhd_files/2025.txt
+++ b/vhd_files/2025.txt
@@ -3 +3 @@ 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.0.2/windows-amd64.zip
+c:\akse-cache\aks-secure-tls-bootstrap-client\: https://github.com/Azure/aks-secure-tls-bootstrap/releases/download/client/v1.0.1/windows-amd64.zip
@@ -53,0 +54 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.3-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.14.0
@@ -55 +56 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.15.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.16.0
+mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.16.0
@@ -57 +57,0 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.17.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.18.0
diff --git a/vhd_files/23H2-gen2.txt b/vhd_files/23H2-gen2.txt
index 6ab5475..e781f50 100644
--- a/vhd_files/23H2-gen2.txt
+++ b/vhd_files/23H2-gen2.txt
@@ -3 +3 @@ 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.0.2/windows-amd64.zip
+c:\akse-cache\aks-secure-tls-bootstrap-client\: https://github.com/Azure/aks-secure-tls-bootstrap/releases/download/client/v1.0.1/windows-amd64.zip
@@ -73,0 +74 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.3-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.14.0
@@ -75 +76 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.15.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.16.0
+mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.16.0
@@ -77 +77,0 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.17.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.18.0
diff --git a/vhd_files/23H2.txt b/vhd_files/23H2.txt
index aab7763..a5ee8d4 100644
--- a/vhd_files/23H2.txt
+++ b/vhd_files/23H2.txt
@@ -3 +3 @@ 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.0.2/windows-amd64.zip
+c:\akse-cache\aks-secure-tls-bootstrap-client\: https://github.com/Azure/aks-secure-tls-bootstrap/releases/download/client/v1.0.1/windows-amd64.zip
@@ -73,0 +74 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.3-windows-hp
+mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.14.0
@@ -75 +76 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.15.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.16.0
+mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.16.0
@@ -77 +77,0 @@ mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.17.0
-mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.18.0

[Copilot]

Pull request overview

This pull request is a cherry-pick that adjusts the retry and timeout parameters for the apt-mark hold walinuxagent command during Ubuntu node provisioning. The change improves reliability by providing longer individual timeouts while reducing total retry attempts.

Changes:

• Modified retry parameters in aptmarkWALinuxAgent() function from 225 2 2 to 120 2 60
• Regenerated snapshot test data for CustomData files across multiple test scenarios

Reviewed changes

Copilot reviewed 44 out of 44 changed files in this pull request and generated no comments.

File	Description
parts/linux/cloud-init/artifacts/ubuntu/cse_helpers_ubuntu.sh	Changed apt-mark retry parameters: reduced retry count (225→120), kept wait interval (2s), increased per-attempt timeout (2s→60s)
pkg/agent/testdata/*/CustomData	Regenerated base64-encoded gzipped test snapshots to reflect the provisioning script change