Skip to content

feat: windows node set mcr containerd host config for network isolated cluster#7902

Merged
fseldow merged 7 commits intomainfrom
xinhl/windowsimage
Mar 3, 2026
Merged

feat: windows node set mcr containerd host config for network isolated cluster#7902
fseldow merged 7 commits intomainfrom
xinhl/windowsimage

Conversation

@fseldow
Copy link
Contributor

@fseldow fseldow commented Feb 18, 2026

What this PR does / why we need it:
To support network isolated cluster
setup mcr containerd hosts, to allow the cluster pull mcr images from acr first.

feat: windows node set mcr containerd host config for network isolated cluster
Which issue(s) this PR fixes:

Fixes #

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR adds Windows node support for network isolated clusters by configuring containerd to use a bootstrap profile container registry as a mirror for MCR (Microsoft Container Registry) images. The implementation adds a new PowerShell function for Windows nodes and includes corresponding variable initialization in the CSE scripts. Additionally, it fixes a missing "server" directive in the Linux MCR China Cloud configuration.

Changes:

  • Adds Windows containerd configuration to redirect MCR image pulls to the bootstrap profile container registry for network isolated clusters
  • Sets global variables for bootstrap profile registry and MCR repository base in Windows CSE scripts
  • Fixes missing "server" directive in Linux MCR China Cloud containerd hosts configuration
  • Adds e2e test to validate Windows containerd registry configuration in network isolated clusters

Reviewed changes

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

File Description
staging/cse/windows/containerdfunc.ps1 Adds Set-BootstrapProfileRegistryContainerdHost function and conditional logic to configure MCR registry mirroring for network isolated clusters
parts/windows/kuberneteswindowssetup.ps1 Initializes global variables for bootstrap profile container registry server and MCR repository base
parts/linux/cloud-init/artifacts/cse_config.sh Adds missing "server" directive to MCR China Cloud containerd hosts configuration
e2e/scenario_win_test.go Adds test for Windows network isolated cluster containerd configuration

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.

@fseldow fseldow force-pushed the xinhl/windowsimage branch from 336ab5b to df935a2 Compare March 2, 2026 18:07
Copilot AI review requested due to automatic review settings March 2, 2026 18:18
@fseldow fseldow requested review from YaoC and yewmsft as code owners March 2, 2026 18:18
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 35 out of 88 changed files in this pull request and generated 2 comments.

Copilot AI review requested due to automatic review settings March 2, 2026 20:22
@fseldow fseldow requested review from sulixu and surajssd as code owners March 2, 2026 20:22
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 22 out of 22 changed files in this pull request and generated 2 comments.

@fseldow fseldow merged commit 510c2a3 into main Mar 3, 2026
34 of 35 checks passed
@fseldow fseldow deleted the xinhl/windowsimage branch March 3, 2026 02:07
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.

3 participants