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.

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

cni: don't overwrite CNI changes when cni.exclusive is false #26773

Merged
merged 1 commit into from Jul 19, 2023
Merged

cni: don't overwrite CNI changes when cni.exclusive is false #26773

merged 1 commit into from Jul 19, 2023

Conversation

squeed
Copy link
Contributor

@squeed squeed commented Jul 12, 2023 •
edited

Normally the CNI config manager watches for changes, and overwrites the cilium CNI config file if necessary. However, we also need to support cases where end-users would like to modify the config that Cilium generates.

So, when cni.exclusive is false, then also disable the file watcher.

Fixes: #26760

Cilium by default overwrites changes to its CNI configuration file. With this change, setting cni.exclusive to false disables this behavior. This is useful when additional plugins wish to chain after Cilium, such as Istio.

@squeed
cni: don't overwrite CNI changes when cni.exclusive is false
e1d9773 
Normally the CNI config manager watches for changes, and overwrites the
cilium CNI config file if necessary. However, we also need to support
cases where end-users would like to modify the config that Cilium
generates.

So, when `cni.exclusive` is false, then also disable the file watcher.

Signed-off-by: Casey Callendrello <cdc@isovalent.com>
@squeed squeed added area/cni Impacts the Container Networking Interface between Cilium and the orchestrator. release-note/minor This PR changes functionality that users may find relevant to operating Cilium. needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Jul 12, 2023
@squeed squeed requested a review from a team as a code owner July 12, 2023 07:30
@squeed squeed requested a review from thorn3r July 12, 2023 07:30
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.14.0 Jul 12, 2023
@squeed squeed mentioned this pull request Jul 12, 2023
Closed
2 tasks
@squeed
Copy link
Contributor Author

squeed commented Jul 12, 2023

/test

thorn3r
thorn3r approved these changes Jul 19, 2023
View reviewed changes
Copy link
Contributor

@thorn3r thorn3r left a comment

Choose a reason for hiding this comment

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

excellent 👍

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jul 19, 2023
@squeed squeed merged commit 5136318 into cilium:main Jul 19, 2023
66 checks passed
@nbusseneau nbusseneau mentioned this pull request Jul 24, 2023
Merged
21 tasks
@nbusseneau nbusseneau added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Jul 24, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.14 in 1.14.0 Jul 24, 2023
@nbusseneau nbusseneau added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Jul 25, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.14 to Backport done to v1.14 in 1.14.0 Jul 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thorn3r thorn3r thorn3r approved these changes

Assignees
No one assigned
Labels
area/cni Impacts the Container Networking Interface between Cilium and the orchestrator. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/minor This PR changes functionality that users may find relevant to operating Cilium.
Projects
No open projects
1.14.0
Backport done to v1.14
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Conflict with istio-cni-node when cilium is the main CNI plugin
3 participants
@squeed @thorn3r @nbusseneau