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

Fix cilium to use k3s paths for binPath and confPath v2 #1402

Merged
merged 2 commits into from
Apr 11, 2024

Conversation

prehor
Copy link
Contributor

@prehor prehor commented Apr 2, 2024

Cilium incorrectly uses the /etc/cni/net.d and /opt/cni/bin directories in the node filesystem instead of the corresponding directories in /var/lib/rancher/k3s.

Fixes PR #1381 where links /etc/cni/net.d and /opt/cni/bin to the corresponding directories in /var/lib/rancher/k3s were missing.

@github-actions github-actions bot added the area/bootstrap Changes made in the bootstrap directory label Apr 2, 2024
@onedr0p
Copy link
Owner

onedr0p commented Apr 2, 2024

@prehor were you able to test this on a new debian and cluster install?

I am also trying to understand what is the reason for not just using the system paths of /etc/cni/net.d and /opt/cni/bin, what problem are you trying to solve?

@prehor
Copy link
Contributor Author

prehor commented Apr 2, 2024

I tested it on a new cluster installation. Later (hopefully this week) I'll be able to test it on a fresh Debian install.

k3s now includes core CNI plugins. In the next version of k3s v1.29.4, Multus and a lot of other CNI plugins should be added (k3s-io/k3s#9710) so that they no longer need to be installed manually.

@onedr0p onedr0p marked this pull request as draft April 2, 2024 18:41
@onedr0p
Copy link
Owner

onedr0p commented Apr 2, 2024

Sounds good, I went ahead and marked this PR as a draft. Please switch it back when you have time to test. Thanks!

@prehor
Copy link
Contributor Author

prehor commented Apr 11, 2024

I tested it successfully on a fresh Debian and on a three node cluster. I continue with Multus.

@onedr0p onedr0p marked this pull request as ready for review April 11, 2024 14:13
@onedr0p
Copy link
Owner

onedr0p commented Apr 11, 2024

Sounds good, hopefully other people do not have issues.

@onedr0p onedr0p merged commit 0bb18d4 into onedr0p:main Apr 11, 2024
4 checks passed
@prehor prehor deleted the fix-cilium-k3s-paths-v2 branch April 13, 2024 07:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/bootstrap Changes made in the bootstrap directory
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants