Skip to content
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.

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

Add configuration to create cilium CNI plugin file when cilium>=1.14.0 #10966

Merged

Conversation

cleman95
Copy link
Contributor

What type of PR is this?
/kind bug

What this PR does / why we need it:
This PR is linked to this one #10945 as requested by @yankay.

Cilium 1.14.0 is no longer creating its cni plugin file under /etc/cni/net.d by default. To fix this we must add the write-cni-conf-when-ready key inside the cilium-config configMap .

This will also fix the fact that the keys cilium_cni_exclusive and cilium_cni_log_file are no longer used in this role when deploying cilium >= 1.14.0 .
Which issue(s) this PR fixes:

Fixes #10887

Special notes for your reviewer:
it needs to be cherry-picked to the branch release-2.24 after.

Does this PR introduce a user-facing change?:

NONE

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 27, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @cleman95. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 27, 2024
@yankay
Copy link
Member

yankay commented Feb 28, 2024

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 28, 2024
Copy link
Member

@MrFreezeex MrFreezeex left a comment

Choose a reason for hiding this comment

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

Thanks for the followup PR on the main branch 👍
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 1, 2024
@cleman95
Copy link
Contributor Author

cleman95 commented Mar 1, 2024

/assign @yankay

@yankay
Copy link
Member

yankay commented Mar 3, 2024

Thank you very much @cleman95
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cleman95, MrFreezeex, yankay

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

The pull request process is described 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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 3, 2024
@k8s-ci-robot k8s-ci-robot merged commit 04e40f2 into kubernetes-sigs:master Mar 3, 2024
60 checks passed
cleman95 added a commit to cleman95/kubespray that referenced this pull request Mar 6, 2024
k8s-ci-robot pushed a commit that referenced this pull request Mar 7, 2024
@mzaian mzaian mentioned this pull request Apr 26, 2024
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. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cilium: kubelet does not detect cilium CNI
4 participants