-
Notifications
You must be signed in to change notification settings - Fork 6.5k
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 #10945
Add configuration to create cilium CNI plugin file when cilium>=1.14.0 #10945
Conversation
The committers listed above are authorized under a signed CLA. |
Welcome @cleman95! |
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 Once the patch is verified, the new status will be reflected by the 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. |
e85cfff
to
232c5b9
Compare
/ok-to-test |
{% if cilium_version | regex_replace('v') is version('1.14.0', '>=') %} | ||
# Tell the agent to generate and write a CNI configuration file | ||
write-cni-conf-when-ready: /etc/cni/net.d/05-cilium.conflist | ||
cni-exclusive: "{{ cilium_cni_exclusive }}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will also fix the fact that the keys cilium_cni_exclusive and cilium_cni_log_file are no longer used when deploying cilium 1.14.0 .
These only be used when cilium version < 1.14.0, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No these are still needed when cilium version >= 1.14.0 . They deleted the cni-install.sh
used in the postStart hook which was taking these keys as args but now they need to be passed via the ConfigMap.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
got it, thanks for the expiation!
thanks for the fix! /lgtm |
/assign @floryut |
Thanks @cleman95 |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cleman95, cyclinder, 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 |
HI @cleman95 A fix a PR should be merged into the master branch first and then cherry-pick to the release branch :-) Would you please help to create a patch for the PR and merge it into the master branch? |
What type of PR is this?
/kind bug
What this PR does / why we need it:
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 thewrite-cni-conf-when-ready
key inside thecilium-config
configMap .This will also fix the fact that the keys
cilium_cni_exclusive
andcilium_cni_log_file
are no longer used when deploying cilium 1.14.0 .Which issue(s) this PR fixes:
Fixes #10887
Special notes for your reviewer:
/sig network
This change was introduce in Cilium 1.14 with this commit .
They removed the script (cni-install.sh) that was in charge of creating the cni-plugin file.
Does this PR introduce a user-facing change?: