cni-(un)install: don't touch CNI dir if CILIUM_CUSTOM_CNI_CONF is set #14910
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ti-mo
added
kind/bug
maintainer-s-little-helper
bot
added
the
dont-merge/needs-release-note-label
ti-mo
added
the
release-note/bug
maintainer-s-little-helper
bot
removed
the
dont-merge/needs-release-note-label
joestringer
approved these changes
Feb 9, 2021
|
Is this a bug in a released version of Cilium or only in master? If the latter, maybe |
ti-mo
added
release-note/minor
ti-mo
force-pushed
the
pr/tb/custom-cni-conf
branch
from
5042400
to
68c4438
Compare
aanm
approved these changes
Feb 11, 2021
nathanjsweet
approved these changes
Mar 4, 2021
ti-mo
force-pushed
the
pr/tb/custom-cni-conf
branch
from
68c4438
to
32c06d1
Compare
Fixes cilium#14838. Setting CILIUM_CUSTOM_CNI_CONF on the container now provides full control for the user to manage their own CNI configs. The cilium-cni binary is still installed during agent startup unconditionally. This patch makes CILIUM_CUSTOM_CNI_CONF skip the CNI exclusivity behaiour as well as the Cilium config removal during both startup and shutdown. The agent can still be used with `--read-cni-conf` and `--write-cni-conf-..`. Signed-off-by: Timo Beckers <timo@isovalent.com>
Provide clearer workarounds for the change of behaviour. Link to the PR that introduced it since it links to relevant issues. Signed-off-by: Timo Beckers <timo@isovalent.com>
ti-mo
force-pushed
the
pr/tb/custom-cni-conf
branch
from
32c06d1
to
85fd528
Compare
ti-mo
added
the
ready-to-merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #14838.
See commit messages. I've created a blueprint with a more structural rework to improve this long-term: #14892.
@joestringer Please give some feedback about the upgrade notes. Not sure if this warrants a more drastic
Breaking Changessection, although users that hadcni.customConfset before will see consistent behaviour between 1.9 and 1.10.Also, this should fix microk8s without requiring any further changes there, since
cni.customConfsetsCILIUM_CUSTOM_CNI_CONF=trueon the container. (might also want to remove theglobal.prefix from Helm options in the install script there)Thanks @mvisonneau!