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

Use static CNI bin dir #10868

Merged
merged 1 commit into from
Sep 23, 2024
Merged

Use static CNI bin dir #10868

merged 1 commit into from
Sep 23, 2024

Conversation

brandond
Copy link
Member

@brandond brandond commented Sep 9, 2024

Proposed Changes

Maintain a separate dir for CNI binaries so that additional plugins can be installed in a predictable location that does not change every time k3s is upgraded.

Types of Changes

enhancement

Verification

  1. Note that cni bins are now linked under /var/lib/rancher/k3s/data/cni
  2. Note that /var/lib/rancher/k3s/data/cni is now used as cni_bin dir in /var/lib/rancher/k3s/agent/etc/containerd/config.toml
  3. Note that custom CNI plugins (multus) are still usable after upgrading k3s, as the cni_bin dir no longer changes during upgrades.

Testing

See above

Linked Issues

User-Facing Change

K3s now uses a stable directory for CNI binaries, which simplifies the installation of additional CNI plugins.

Further Comments

@brandond brandond requested a review from a team as a code owner September 9, 2024 22:33
@brandond brandond force-pushed the stable-cni-bin branch 2 times, most recently from ccdbb65 to 959c7e1 Compare September 9, 2024 23:05
Copy link

codecov bot commented Sep 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 44.07%. Comparing base (c4c11e5) to head (0ad1bac).
Report is 9 commits behind head on master.

❗ There is a different number of reports uploaded between BASE (c4c11e5) and HEAD (0ad1bac). Click for more details.

HEAD has 1 upload less than BASE
Flag BASE (c4c11e5) HEAD (0ad1bac)
e2etests 7 6
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #10868      +/-   ##
==========================================
- Coverage   49.69%   44.07%   -5.62%     
==========================================
  Files         178      178              
  Lines       14801    14801              
==========================================
- Hits         7355     6524     -831     
- Misses       6101     7074     +973     
+ Partials     1345     1203     -142     
Flag Coverage Δ
e2etests 36.45% <ø> (-9.56%) ⬇️
inttests 36.72% <ø> (+17.00%) ⬆️
unittests 13.55% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Maintain a separate dir for CNI binaries so that additional plugins can be installed in a predictable location that does not change every time k3s is upgraded.

Signed-off-by: Brad Davidson <[email protected]>
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