Skip to content

Bump cni version #17676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Bump cni version #17676

wants to merge 2 commits into from

Conversation

@ameukam
Copy link
Member

@ameukam ameukam commented Oct 15, 2025

Signed-off-by: Arnaud Meukam [email protected]

@k8s-ci-robot
Copy link
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

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 15, 2025
@k8s-ci-robot k8s-ci-robot requested a review from hakman October 15, 2025 11:53
@k8s-ci-robot k8s-ci-robot requested a review from zetaab October 15, 2025 11:53
@k8s-ci-robot
Copy link
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 rifelpet for approval. For more information see the Code Review Process.

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

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

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 15, 2025
@ameukam
Copy link
Member Author

ameukam commented Oct 15, 2025

/test pull-kops-e2e-k8s-aws-amazonvpc

@ameukam
Copy link
Member Author

ameukam commented Oct 15, 2025

/test pull-kops-e2e-cni-amazonvpc-ipv6
/test pull-kops-e2e-cni-calico
/test pull-kops-e2e-cni-calico-ipv6
/test pull-kops-e2e-cni-cilium
/test pull-kops-e2e-cni-cilium-ipv6
/test pull-kops-e2e-cni-cilium-eni
/test pull-kops-e2e-cni-cilium-etcd
/test pull-kops-e2e-cni-flannel
/test pull-kops-e2e-cni-kuberouter
/test pull-kops-e2e-cni-kindnet
/test pull-kops-e2e-cni-kindnet-ipv6

@ameukam
Copy link
Member Author

ameukam commented Oct 16, 2025

/retest

@ameukam
Copy link
Member Author

ameukam commented Oct 17, 2025

/test pull-kops-e2e-aws-load-balancer-controller
/test pull-kops-e2e-metrics-server
/test pull-kops-e2e-pod-identity-webhook
/test pull-kops-scenario-aws-karpenter

@ameukam
Copy link
Member Author

ameukam commented Oct 17, 2025

/test pull-kops-scenario-aws-karpenter

1 similar comment
@ameukam
Copy link
Member Author

ameukam commented Oct 17, 2025

/test pull-kops-scenario-aws-karpenter

@ameukam
Copy link
Member Author

ameukam commented Oct 17, 2025

/retest

@ameukam
Copy link
Member Author

ameukam commented Oct 17, 2025

/test pull-kops-e2e-cni-cilium-ipv6
/test pull-kops-e2e-cni-calico-ipv6

@ameukam
Use the bridge plugin for CNI
b73d1d2 
Following containerd configuration for the CNI.
Also bump the CNI version to 1.0.0

Signed-off-by: Arnaud Meukam <[email protected]>
@ameukam
./hack/update-expected.sh executed
b7d44f6 
Signed-off-by: Arnaud Meukam <[email protected]>
@ameukam
Copy link
Member Author

ameukam commented Oct 22, 2025

/retest

@k8s-ci-robot
Copy link
Contributor

@ameukam: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-kops-e2e-cni-amazonvpc-ipv6 7cd2a00 link false /test pull-kops-e2e-cni-amazonvpc-ipv6
pull-kops-e2e-cni-kindnet-ipv6 7cd2a00 link false /test pull-kops-e2e-cni-kindnet-ipv6
pull-kops-e2e-cni-cilium 7cd2a00 link true /test pull-kops-e2e-cni-cilium
pull-kops-e2e-cni-kindnet 7cd2a00 link true /test pull-kops-e2e-cni-kindnet
pull-kops-e2e-cni-kuberouter 7cd2a00 link false /test pull-kops-e2e-cni-kuberouter
pull-kops-e2e-metrics-server 0ca1916 link true /test pull-kops-e2e-metrics-server
pull-kops-e2e-aws-load-balancer-controller 0ca1916 link true /test pull-kops-e2e-aws-load-balancer-controller
pull-kops-e2e-k8s-gce-ipalias b7d44f6 link true /test pull-kops-e2e-k8s-gce-ipalias

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

justinsb
justinsb reviewed Oct 24, 2025
View reviewed changes
nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml
}
]
}
contents: "{\n \"cniVersion\": \"1.0.0\",\n \"name\": \"k8s-pod-network\",\n
Copy link
Member

Choose a reason for hiding this comment

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

Ouch ... can we keep the formatting? (Did it change because the value is shorter or something like that? I love yaml!)

Copy link
Member

Choose a reason for hiding this comment

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

I think the new string contains a mix of tabs and spaces which caused this formatting change. Replacing the tabs with spaces in containerd.go should fix the formatting here.

nodeup/pkg/model/containerd.go
"plugins": [
{
"type": "ptp",
"type": "bridge",
Copy link
Member

Choose a reason for hiding this comment

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

This feels like a bit more than a version bump. Did they remove ptp?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@justinsb justinsb justinsb left review comments

@rifelpet rifelpet rifelpet left review comments

@hakman hakman Awaiting requested review from hakman

@zetaab zetaab Awaiting requested review from zetaab

Assignees

No one assigned

Labels

area/nodeup cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ameukam @k8s-ci-robot @justinsb @rifelpet