draft: add file and test for file #5995
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timmy-wright
force-pushed
the
timmy/ensure-right-vhd-used
branch
from
f97a342 to
1eec3c4
Compare
timmy-wright
force-pushed
the
timmy/ensure-right-vhd-used
branch
from
521e929 to
ef9c7ce
Compare
|
No changes to cached containers or packages on Windows VHDs |
timmy-wright
requested review from
juan-lee,
cameronmeissner,
UtheMan,
ganeshkumarashok,
anujmaheshwari1,
AlisonB319,
Devinwong,
lilypan26,
AbelHu,
junjiezhang1997,
jason1028kr,
djsly,
phealy,
r2k1,
zachary-bailey,
bravebeaver and
smith1511
as code owners
timmy-wright
commented
Mar 6, 2025
| @@ -903,6 +903,9 @@ try | |||
| Clear-TempFolder | |||
| Log-VHDFreeSize | |||
| Test-AzureExtensions | |||
|
|
|||
| Write-Output "creating test.txt file" | |||
| Write-Output "this is a test file" > "c:\k\test.txt" | |||
There was a problem hiding this comment.
Reminder to Tim: I have to remove this once I've tested the e2e tests are running against the right VHDs.
timmy-wright
commented
Mar 6, 2025
| @@ -25,6 +25,7 @@ func Test_Windows2019Containerd(t *testing.T) { | |||
| ValidateFileHasContent(ctx, s, "/k/kubeletstart.ps1", "--container-runtime=remote") | |||
| ValidateWindowsProcessHasCliArguments(ctx, s, "kubelet.exe", []string{"--rotate-certificates=true", "--client-ca-file=c:\\k\\ca.crt"}) | |||
| ValidateCiliumIsNotRunningWindows(ctx, s) | |||
| ValidateFileHasContent(ctx, s, "/k/test.txt", "this is a test file") | |||
There was a problem hiding this comment.
These are currently here to check the e2e tests are being run with the right VHD version. They will be removed before I merge the PR.
timmy-wright
commented
Mar 6, 2025
e2e/vmss.go
Outdated
| s.T.Logf("vhd rgr id %s", nodeBootstrapping.SigImageConfig.ResourceGroup) | ||
| s.T.Logf("vhd galler %s", nodeBootstrapping.SigImageConfig.Gallery) | ||
| s.T.Logf("vhd versio %s", nodeBootstrapping.SigImageConfig.Version) | ||
| s.T.Logf("vhd defini %s", nodeBootstrapping.SigImageConfig.Definition) |
There was a problem hiding this comment.
Reminder: remove these logs.
|
Changes cached containers or packages on windows VHDs diff --git a/vhd_files/2019-containerd.txt b/vhd_files/2019-containerd.txt
index dd5c3f0..6a380ad 100644
--- a/vhd_files/2019-containerd.txt
+++ b/vhd_files/2019-containerd.txt
@@ -52 +51,0 @@
- "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.1.25",
@@ -56 +54,0 @@
- "mcr.microsoft.com/containernetworking/azure-cns:v1.4.59",
@@ -87,2 +85 @@
- "mcr.microsoft.com/windows/nanoserver:1809",
- "mcr.microsoft.com/windows/servercore:ltsc2019"
+ "mcr.microsoft.com/windows/nanoserver:1809"
diff --git a/vhd_files/2022-containerd-gen2.txt b/vhd_files/2022-containerd-gen2.txt
index a991c38..8fffb41 100644
--- a/vhd_files/2022-containerd-gen2.txt
+++ b/vhd_files/2022-containerd-gen2.txt
@@ -91 +90,0 @@
- "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.1.25",
@@ -95 +93,0 @@
- "mcr.microsoft.com/containernetworking/azure-cns:v1.4.59",
@@ -126,3 +124 @@
- "mcr.microsoft.com/windows/nanoserver:ltsc2022",
- "mcr.microsoft.com/windows/servercore:ltsc2022",
- "mcr.microsoft.com/windows/servercore/iis:windowsservercore-ltsc2022"
+ "mcr.microsoft.com/windows/nanoserver:ltsc2022"
diff --git a/vhd_files/2022-containerd.txt b/vhd_files/2022-containerd.txt
index 7f783e4..dde274a 100644
--- a/vhd_files/2022-containerd.txt
+++ b/vhd_files/2022-containerd.txt
@@ -91 +90,0 @@
- "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.1.25",
@@ -95 +93,0 @@
- "mcr.microsoft.com/containernetworking/azure-cns:v1.4.59",
@@ -126,3 +124 @@
- "mcr.microsoft.com/windows/nanoserver:ltsc2022",
- "mcr.microsoft.com/windows/servercore:ltsc2022",
- "mcr.microsoft.com/windows/servercore/iis:windowsservercore-ltsc2022"
+ "mcr.microsoft.com/windows/nanoserver:ltsc2022"
diff --git a/vhd_files/2025-gen2.txt b/vhd_files/2025-gen2.txt
index 3ae1bb6..64d601a 100644
--- a/vhd_files/2025-gen2.txt
+++ b/vhd_files/2025-gen2.txt
@@ -36 +35,0 @@
- "mcr.microsoft.com/containernetworking/azure-cns:v1.4.59",
@@ -67,2 +66 @@
- "mcr.microsoft.com/windows/nanoserver:ltsc2022",
- "mcr.microsoft.com/windows/servercore:ltsc2022"
+ "mcr.microsoft.com/windows/nanoserver:ltsc2022"
diff --git a/vhd_files/2025.txt b/vhd_files/2025.txt
index 1f772e4..2a62f93 100644
--- a/vhd_files/2025.txt
+++ b/vhd_files/2025.txt
@@ -36 +35,0 @@
- "mcr.microsoft.com/containernetworking/azure-cns:v1.4.59",
@@ -67,2 +66 @@
- "mcr.microsoft.com/windows/nanoserver:ltsc2022",
- "mcr.microsoft.com/windows/servercore:ltsc2022"
+ "mcr.microsoft.com/windows/nanoserver:ltsc2022"
diff --git a/vhd_files/23H2-gen2.txt b/vhd_files/23H2-gen2.txt
index 80a110c..9605b60 100644
--- a/vhd_files/23H2-gen2.txt
+++ b/vhd_files/23H2-gen2.txt
@@ -42 +41,0 @@
- "mcr.microsoft.com/containernetworking/azure-cns:v1.4.59",
@@ -73,3 +72 @@
- "mcr.microsoft.com/windows/nanoserver:ltsc2022",
- "mcr.microsoft.com/windows/servercore:ltsc2022",
- "mcr.microsoft.com/windows/servercore/iis:windowsservercore-ltsc2022"
+ "mcr.microsoft.com/windows/nanoserver:ltsc2022"
diff --git a/vhd_files/23H2.txt b/vhd_files/23H2.txt
index c77975d..1c3f03c 100644
--- a/vhd_files/23H2.txt
+++ b/vhd_files/23H2.txt
@@ -42 +41,0 @@
- "mcr.microsoft.com/containernetworking/azure-cns:v1.4.59",
@@ -73,3 +72 @@
- "mcr.microsoft.com/windows/nanoserver:ltsc2022",
- "mcr.microsoft.com/windows/servercore:ltsc2022",
- "mcr.microsoft.com/windows/servercore/iis:windowsservercore-ltsc2022"
+ "mcr.microsoft.com/windows/nanoserver:ltsc2022" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #
Requirements:
Special notes for your reviewer:
Release note: