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

[release-1.31] Fixes "file exists" error from CNI bins when upgrading k3s #11125

Merged

Conversation

brandond
Copy link
Member

Proposed Changes

Unlink existing CNI bin symlinks to avoid "file exists" error when upgrading K3s from an existing version with stable CNI bin support.

Also added support for enabling debug logging early in startup of the self-extracting wrapper; this was not being done early enough to capture debug level logs from the extract function.

Types of Changes

bugfix

Verification

  • see linked issue comment

Testing

Linked Issues

User-Facing Change

Further Comments

Fixes "file exists" error when upgrading k3s.

Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond requested a review from a team as a code owner October 19, 2024 04:39
Copy link

codecov bot commented Oct 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 42.05%. Comparing base (0955fa3) to head (3179fe9).
Report is 1 commits behind head on release-1.31.

❗ There is a different number of reports uploaded between BASE (0955fa3) and HEAD (3179fe9). Click for more details.

HEAD has 1 upload less than BASE
Flag BASE (0955fa3) HEAD (3179fe9)
e2etests 7 6
Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.31   #11125      +/-   ##
================================================
- Coverage         48.93%   42.05%   -6.88%     
================================================
  Files               178      178              
  Lines             14796    18474    +3678     
================================================
+ Hits               7240     7769     +529     
- Misses             6253     9504    +3251     
+ Partials           1303     1201     -102     
Flag Coverage Δ
e2etests 34.37% <ø> (-10.51%) ⬇️
inttests 18.65% <ø> (-18.25%) ⬇️
unittests 13.15% <ø> (-0.44%) ⬇️

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.

@brandond brandond merged commit 221ab22 into k3s-io:release-1.31 Oct 21, 2024
30 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.

2 participants