Fix K3S_DATA_DIR when running as non-root user #11378
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #11378 +/- ##
==========================================
- Coverage 50.04% 47.81% -2.24%
==========================================
Files 185 185
Lines 19239 19239
==========================================
- Hits 9629 9199 -430
- Misses 8222 8717 +495
+ Partials 1388 1323 -65
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
|
Thanks for the fix! Can you open an issue describing the problem this fixes, so our QA team can validate that the issue is resolved by this change? |
brandond
requested changes
Nov 28, 2024
brandond
previously approved these changes
Dec 3, 2024
thomasferrandiz
previously approved these changes
Dec 3, 2024
|
Any chance this get's merged soonish? Thanks. |
|
We are in code freeze for December releases. This will get in for January. |
|
Would you mind rebasing this? Thanks! |
unguiculus
dismissed stale reviews from thomasferrandiz and brandond
via
843d504
unguiculus
force-pushed
the
fix-data-dir
branch
from
329d73f to
843d504
Compare
|
@brandond Done. |
When running the generated kill and uninstall scripts, the environment variable `K3S_DATA_DIR` got lost, because `sudo` by default doesn't preserve the environment. This is fixed by adding the `--preserve-env` flag. Signed-off-by: Reinhard Nägele <[email protected]>
unguiculus
force-pushed
the
fix-data-dir
branch
from
843d504 to
749bf91
Compare
dereknola
approved these changes
Jan 9, 2025
brandond
approved these changes
Jan 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Changes
When running the generated kill and uninstall scripts as non-root user, the environment variable
K3S_DATA_DIRgot lost, becausesudoby default doesn't preserve the environment. This is fixed by adding the--preserve-envflag.Types of Changes
Bugfix
Verification
K3S_DATA_DIR.k3s-uninstall.shscript as non-root user and check the log output.$K3S_DATA_DIRdirectory got cleaned.Fixes: #11386