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 cni path config in whereabouts to make it work in k3s #426

Merged
merged 1 commit into from
Mar 27, 2024

Conversation

manuelbuil
Copy link
Contributor

@manuelbuil manuelbuil commented Mar 22, 2024

The CNI binaries and CNI config files do not use the default paths in k3s, therefore, we need a way to configure those parameters if we want to use whereabouts

Multus version must be incremented because it embeds whereabouts

@manuelbuil manuelbuil requested a review from a team as a code owner March 22, 2024 17:33
@@ -46,5 +46,9 @@ tolerations:

affinity: {}

cni_conf:
Copy link
Member

@brandond brandond Mar 22, 2024

Choose a reason for hiding this comment

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

does it have to be cni_conf? The convention is to use camelCase in yaml, not underscores. Maybe just cni or cniConf?

Suggested change
cni_conf:
cni:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

good point! I just copied what Multus is using

Copy link
Contributor

@mgfritch mgfritch left a comment

Choose a reason for hiding this comment

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

(nit) doesn't affect the functionality, but should we also bump the whereabouts packageVersion too?

@brandond
Copy link
Member

yeah, I think we should bump both the chart, and the subchart?

Signed-off-by: Manuel Buil <mbuil@suse.com>
@manuelbuil manuelbuil merged commit 893bce4 into rancher:main-source Mar 27, 2024
1 check passed
@manuelbuil manuelbuil deleted the whereAboutsCNIPaths branch March 27, 2024 06:40
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.

3 participants