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

Don't ignore assets in home dir if system assets exist #8458

Merged
merged 1 commit into from
Sep 27, 2023

Conversation

brandond
Copy link
Member

@brandond brandond commented Sep 26, 2023

Proposed Changes

Prefer user assets over system assets, if both exist

Types of Changes

bugfix

Verification

On old release

  1. install K3s but do not start it.
  2. Run k3s check-config as unprivileged user; note that assets are extracted out to $HOME/.rancher/k3s/data and checked
  3. Run k3s check-config as root; note that assets are extracted out to /var/lib/rancher/k3s/data and checked
  4. Run k3s check-config as unprivileged user again; note that this time the assets in /var/lib/rancher/k3s/data are checked, instead of the user assets.

On new release
Perform above steps, but in step 4, note that the assets in the home directory are still checked, even if system-level assets exist.

Testing

Linked Issues

User-Facing Change


Further Comments

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond requested a review from a team as a code owner September 26, 2023 20:44
@codecov
Copy link

codecov bot commented Sep 26, 2023

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (4dd45b3) 48.38% compared to head (71f56a7) 51.49%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8458      +/-   ##
==========================================
+ Coverage   48.38%   51.49%   +3.10%     
==========================================
  Files         143      143              
  Lines       14828    14828              
==========================================
+ Hits         7175     7635     +460     
+ Misses       6480     5974     -506     
- Partials     1173     1219      +46     
Flag Coverage Δ
e2etests 48.75% <ø> (?)
inttests 44.60% <ø> (-1.14%) ⬇️
unittests 19.73% <ø> (ø)

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

see 39 files with indirect coverage changes

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

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