Repository navigation
fix(windows): preserve containerd URLs and correct Hyper-V runtime paths - #9820
Merged
Merged
Conversation
Tim Wright (timmy-wright)
requested review from
a team,
Nishchay (awesomenix),
Ben Brady (benjamin-brady),
Cameron Meissner (cameronmeissner),
Sylvain Boily (djsly) and
Artur Khantimirov (r2k1)
as code owners
October 19, 2026 04:00
Contributor
Windows Unit Test Results 3 files 18 suites 50s ⏱️ Results for commit 56ced65. ♻️ This comment has been updated with latest results. |
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
Static review identified no blocking issues in the focused fixes or regression coverage; tests were not executed.
No open issues 🎉
What changed in this PR
Fixes Windows containerd provisioning to respect explicit package URLs and generate version-appropriate Hyper-V runtime configuration.
Changes:
- Preserves supplied containerd URLs on Windows Server 2025.
- Selects the correct CRI plugin path for containerd 1.x and 2.x.
- Expands regression coverage and isolates generated test files in TestDrive.
| File | Description |
|---|---|
| staging/cse/windows/containerdfunc.tests.ps1 | Tests both isolation defaults and version-specific runtime paths. |
| staging/cse/windows/containerdfunc.ps1 | Substitutes the appropriate runtime plugin path. |
| parts/windows/windowscsehelper.tests.ps1 | Tests preservation of explicit package URLs. |
| parts/windows/windowscsehelper.ps1 | Removes Windows Server 2025 URL rewriting. |
Review effort: Balanced
Contributor
|
Contributor
|
Contributor
|
Tim Wright (timmy-wright)
enabled auto-merge (squash)
October 19, 2026 21:15
Cameron Meissner (cameronmeissner)
approved these changes
Oct 19, 2026
Nishchay (awesomenix)
approved these changes
Oct 19, 2026
This file contains hidden or 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
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 this PR does / why we need it:
Preserves explicitly supplied containerd package URLs on Windows Server 2025 instead of rewriting them to a fixed containerd 2.x version.
Generates Hyper-V runtime handlers under the appropriate CRI plugin:
plugins.crifor containerd 1.x andplugins.'io.containerd.cri.v1.runtime'for containerd 2.x. This keeps the handler and options tables consistent with the selected configuration template.Sets
IoRetryTimeoutInSec = 300in the containerd 2.x default runtime's runhcs options. This replaces infinite stdout/stderr pipe-reconnection retries with a five-minute retry budget after an IO disconnection, such as a containerd restart. The option is documented in the runhcs options definition. It does not change the containerd 1.x template, explicitly named runtime handlers, or debug logging.Expands Pester coverage for explicit URLs and Hyper-V handlers with both process and Hyper-V default isolation, and isolates generated test configuration under Pester's TestDrive.
Validation and rollout considerations:
Which issue(s) this PR fixes:
No linked issue.