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

Make cilium cni.exclusive configurable #838

Merged
merged 5 commits into from
Nov 27, 2024

Conversation

petrutlucian94
Copy link
Contributor

We'll add an annotation, making the cilium "cni.exclusive" setting configurable. This will allow using additional CNIs such as Multus.

Requires: canonical/k8s-snap-api#20
Fixes: #796

@petrutlucian94 petrutlucian94 requested a review from a team as a code owner November 25, 2024 12:37
@petrutlucian94 petrutlucian94 changed the title Make cilium.exclusive configurable Make cilium cni.exclusive configurable Nov 25, 2024
Copy link
Contributor

@bschimke95 bschimke95 left a comment

Choose a reason for hiding this comment

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

Great stuff, added some questions/comments.

docs/src/snap/reference/annotations.md Outdated Show resolved Hide resolved
src/k8s/pkg/k8sd/features/cilium/internal_test.go Outdated Show resolved Hide resolved
We'll add an annotation, making the cilium "cni.exclusive" setting
configurable. This will allow using additional CNIs such as Multus.
* use "cni.exclusive=false" by default
* only check if the annotation is set, do not expect an actual
  boolean value
* s/AnnotationCniExclusive/AnnotationCNIExclusive
Copy link
Contributor

@bschimke95 bschimke95 left a comment

Choose a reason for hiding this comment

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

LGTM after CI is green

@petrutlucian94
Copy link
Contributor Author

Error: pkg/k8sd/features/cilium/internal.go:75:48: undefined: apiv1_annotations.AnnotationCNIExclusive

We need to merge the other PR first and then bump the requirement.

Some docs are generated based on the k8s-snap-api docstrings.

We've just bumped the k8s-snap-api version and the docs are out of
sync because of a spelling fix. To fix the docs CI job, we need
to apply this fix here as well.

In the future, we may want to remove automatically generated docs
from the Github repo.
@petrutlucian94 petrutlucian94 merged commit 7e508d9 into canonical:main Nov 27, 2024
16 of 17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Proper Multus support
2 participants