Skip to content

fix: repair CNI matrix update from Dependabot #2145 - #2147

Open
MaxRink wants to merge 1 commit into
kubernetes-sigs:mainfrom
MaxRink:fix/dependabot-2145-tracking-manifest
Open

fix: repair CNI matrix update from Dependabot #2145#2147
MaxRink wants to merge 1 commit into
kubernetes-sigs:mainfrom
MaxRink:fix/dependabot-2145-tracking-manifest

Conversation

@MaxRink

@MaxRink MaxRink commented Aug 22, 2026

Copy link
Copy Markdown
Contributor

Summary

This draft is a follow-up to Dependabot PR #2145. It does not modify or close that PR.

Failures and root causes

Fix

  • Restore the generated release-1-32 tracking manifest and apply the intended github.com/containernetworking/plugins v1.6.0 -> v1.6.2 update without changing the Go directive or dropping the other tracked modules.
  • Keep the upstream CNI tarball version independent from the Kubernetes package repository version. Kubernetes 1.32 currently publishes kubernetes-cni 1.6.0 in its DEB/RPM repositories, so package-based targets continue using 1.6.0 while URL-based targets use the requested v1.6.2 tarball.
  • Regenerate the canonical matrix and document the intentional distinction.

Validation

  • python3 images/capi/hack/kubernetes-version-matrix.py sync-tracking --write
  • python3 images/capi/hack/kubernetes-version-matrix.py verify
  • Rendered 1.32 matrix check: CNI tarball v1.6.2, DEB/RPM package 1.6.0 / 1.6.0-1.1
  • Parsed the generated YAML with yq and ran git diff --check

The vSphere OVA job requires the Prow/vSphere environment and is not run locally; its Photon failure is unrelated to this matrix fix.

@kubernetes-prow

Copy link
Copy Markdown
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@kubernetes-prow kubernetes-prow Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 22, 2026
@kubernetes-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign averagemarcus for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@linux-foundation-easycla

linux-foundation-easycla Bot commented Aug 22, 2026

Copy link
Copy Markdown

CLA Signed
The committers listed above are authorized under a signed CLA.

  • ✅ login: MaxRink / name: Maximilian Rink (5bc5dad)

@kubernetes-prow kubernetes-prow Bot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 22, 2026
@MaxRink
MaxRink force-pushed the fix/dependabot-2145-tracking-manifest branch from a8e91ca to 5bc5dad Compare August 22, 2026 16:37
@kubernetes-prow kubernetes-prow Bot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Aug 22, 2026
@MaxRink

MaxRink commented Aug 22, 2026

Copy link
Copy Markdown
Contributor Author

/test all

@MaxRink
MaxRink marked this pull request as ready for review August 22, 2026 17:39
@kubernetes-prow kubernetes-prow Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 22, 2026
@kubernetes-prow
kubernetes-prow Bot requested a review from mboersma August 22, 2026 17:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant