Skip to content

Fix CAPZ Windows containerd 2.4 CNI config - #593

Merged
kubernetes-prow[bot] merged 1 commit into
kubernetes-sigs:masterfrom
zylxjtu:master
Sep 18, 2026
Merged

kubernetes-prow[bot] merged 1 commit into
kubernetes-sigs:masterfrom
zylxjtu:master

Conversation

@zylxjtu

@zylxjtu zylxjtu commented Sep 17, 2026

Copy link
Copy Markdown
Contributor

Default Windows nodes to containerd 2.3.5 instead of selecting a floating release.

Convert legacy config-v3 CRI CNI bin_dir to bin_dirs when upgrading to containerd 2.4 or later, while preserving older runtime and config compatibility. Update the generated CAPZ templates and documentation accordingly.

@kubernetes-prow kubernetes-prow Bot added tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 17, 2026
@zylxjtu

zylxjtu commented Sep 17, 2026

Copy link
Copy Markdown
Contributor Author

there is windows test grid regression https://prow.k8s.io/view/gs/kubernetes-ci-logs/logs/ci-kubernetes-e2e-capz-master-windows/2100618297736171520, this is to fix it

@zylxjtu

zylxjtu commented Sep 17, 2026

Copy link
Copy Markdown
Contributor Author

this PR also addressed the issue of #592

@kubernetes-prow kubernetes-prow Bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 17, 2026
Default Windows nodes to containerd 2.3.5 instead of selecting a floating release.

Convert legacy config-v3 CRI CNI bin_dir to bin_dirs when upgrading to containerd 2.4 or later, while preserving older runtime and config compatibility. Update the generated CAPZ templates and documentation accordingly.
:
@marosset

Copy link
Copy Markdown
Contributor

/lgtm
/approve
/hold for ws2022 CI

@kubernetes-prow kubernetes-prow Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 17, 2026
@kubernetes-prow kubernetes-prow Bot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 17, 2026
@kubernetes-prow

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: marosset, zylxjtu

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@zylxjtu

zylxjtu commented Sep 18, 2026

Copy link
Copy Markdown
Contributor Author

/hold cancel

@kubernetes-prow kubernetes-prow Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 18, 2026
@kubernetes-prow
kubernetes-prow Bot merged commit 4ef7085 into kubernetes-sigs:master Sep 18, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants