Skip to content

fix: handle curl exit code 000 in validate-kubelet-credentials.sh #6201

Merged
UtheMan merged 1 commit intoofficial/v20250406from
mikolaj/v20250406-cherry-pick
Apr 11, 2025
Merged

fix: handle curl exit code 000 in validate-kubelet-credentials.sh #6201
UtheMan merged 1 commit intoofficial/v20250406from
mikolaj/v20250406-cherry-pick

Conversation

@UtheMan
Copy link
Contributor

@UtheMan UtheMan commented Apr 11, 2025

No description provided.

@github-actions
Copy link
Contributor

Changes cached containers or packages on windows VHDs

diff --git a/vhd_files/2019-containerd.txt b/vhd_files/2019-containerd.txt
index e9df5fd..643be00 100644
--- a/vhd_files/2019-containerd.txt
+++ b/vhd_files/2019-containerd.txt
@@ -51,0 +52 @@
+  "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.1.25",
@@ -87,2 +88 @@
-  "mcr.microsoft.com/windows/servercore:10.0.17763.7009",
-  "mcr.microsoft.com/windows/servercore:10.0.17763.7136"
+  "mcr.microsoft.com/windows/servercore:ltsc2019"
diff --git a/vhd_files/2022-containerd-gen2.txt b/vhd_files/2022-containerd-gen2.txt
index a912ff9..e512ec0 100644
--- a/vhd_files/2022-containerd-gen2.txt
+++ b/vhd_files/2022-containerd-gen2.txt
@@ -90,0 +91 @@
+  "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.1.25",
@@ -126,2 +127 @@
-  "mcr.microsoft.com/windows/servercore:10.0.20348.3328",
-  "mcr.microsoft.com/windows/servercore:10.0.20348.3453",
+  "mcr.microsoft.com/windows/servercore:ltsc2022",
diff --git a/vhd_files/2022-containerd.txt b/vhd_files/2022-containerd.txt
index ff91fe0..d816008 100644
--- a/vhd_files/2022-containerd.txt
+++ b/vhd_files/2022-containerd.txt
@@ -90,0 +91 @@
+  "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.1.25",
@@ -126,2 +127 @@
-  "mcr.microsoft.com/windows/servercore:10.0.20348.3328",
-  "mcr.microsoft.com/windows/servercore:10.0.20348.3453",
+  "mcr.microsoft.com/windows/servercore:ltsc2022",
diff --git a/vhd_files/2025-gen2.txt b/vhd_files/2025-gen2.txt
index 0f4d8c6..a0d5bb7 100644
--- a/vhd_files/2025-gen2.txt
+++ b/vhd_files/2025-gen2.txt
@@ -68,2 +68 @@
-  "mcr.microsoft.com/windows/servercore:10.0.26100.3476",
-  "mcr.microsoft.com/windows/servercore:10.0.26100.3775"
+  "mcr.microsoft.com/windows/servercore:ltsc2022"
diff --git a/vhd_files/2025.txt b/vhd_files/2025.txt
index 867f2d1..9513209 100644
--- a/vhd_files/2025.txt
+++ b/vhd_files/2025.txt
@@ -68,2 +68 @@
-  "mcr.microsoft.com/windows/servercore:10.0.26100.3476",
-  "mcr.microsoft.com/windows/servercore:10.0.26100.3775"
+  "mcr.microsoft.com/windows/servercore:ltsc2022"
diff --git a/vhd_files/23H2-gen2.txt b/vhd_files/23H2-gen2.txt
index b4c04d1..d641f54 100644
--- a/vhd_files/23H2-gen2.txt
+++ b/vhd_files/23H2-gen2.txt
@@ -74,2 +74 @@
-  "mcr.microsoft.com/windows/servercore:10.0.20348.3328",
-  "mcr.microsoft.com/windows/servercore:10.0.20348.3453",
+  "mcr.microsoft.com/windows/servercore:ltsc2022",
diff --git a/vhd_files/23H2.txt b/vhd_files/23H2.txt
index f02c251..3e647d9 100644
--- a/vhd_files/23H2.txt
+++ b/vhd_files/23H2.txt
@@ -74,2 +74 @@
-  "mcr.microsoft.com/windows/servercore:10.0.20348.3328",
-  "mcr.microsoft.com/windows/servercore:10.0.20348.3453",
+  "mcr.microsoft.com/windows/servercore:ltsc2022",

@UtheMan UtheMan merged commit 6048f87 into official/v20250406 Apr 11, 2025
11 of 13 checks passed
@UtheMan UtheMan deleted the mikolaj/v20250406-cherry-pick branch April 11, 2025 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants