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

Fixes "file exists" error from CNI bins when upgrading k3s #11123

Merged
merged 1 commit into from
Oct 21, 2024

Conversation

brandond
Copy link
Member

@brandond brandond commented Oct 18, 2024

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

@brandond brandond requested a review from a team as a code owner October 18, 2024 20:34
Copy link

codecov bot commented Oct 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 42.15%. Comparing base (c0d661b) to head (b44751e).
Report is 2 commits behind head on master.

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

HEAD has 2 uploads less than BASE
Flag BASE (c0d661b) HEAD (b44751e)
e2etests 8 6
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #11123      +/-   ##
==========================================
- Coverage   48.72%   42.15%   -6.58%     
==========================================
  Files         178      178              
  Lines       14813    18498    +3685     
==========================================
+ Hits         7218     7797     +579     
- Misses       6288     9492    +3204     
+ Partials     1307     1209      -98     
Flag Coverage Δ
e2etests 34.28% <ø> (-11.79%) ⬇️
inttests 34.61% <ø> (?)
unittests 13.11% <ø> (-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.

Fixes "file exists" error when upgrading k3s.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond force-pushed the fix-cni-bin-symlink branch from 3825686 to b44751e Compare October 18, 2024 23:06
@brandond brandond merged commit 8ce04d3 into k3s-io:master 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.

3 participants