Add support for setting kubelet root directory #5186
Draft
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
Use k0sVars.DataDir instead of copying it to dataDir to improve readability. No functional changes. Signed-off-by: Natanael Copa <[email protected]>
ncopa
force-pushed
the
kubelet-root-dir
branch
2 times, most recently
from
78c3f73
to
2a4a99e
Compare
Storage drivers and others may hardcode /var/lib/kubelet which confilicts with the k0s default /var/lib/k0s/kubelet. Allow users to override the kubelet root directory with --kubelet-root-dir similar to the way they can override --data-dir. ref: https://cep.dev/posts/adventure-trying-change-kubelet-rootdir/ fixes k0sproject#1842 Signed-off-by: Natanael Copa <[email protected]>
Use --kubelet-root-dir for the inttests: - kubeletcertrotate - reset Signed-off-by: Natanael Copa <[email protected]>
ncopa
force-pushed
the
kubelet-root-dir
branch
from
adcc12e
to
2d7aed2
Compare
Make sure that we don't have anything mounted under those directories so we don't delete persistent data. We do this py parsing /proc/mounts in reverse order as it is listed in mount order, and then we unmount anything that is under our directories before we delete them. Don't umount datadir itself if it is on a separate partition/mount Fixes k0sproject#4318 Signed-off-by: Natanael Copa <[email protected]>
Add a script to the reset integration test that tries to clutter the data directory by placing files and directories with odd permissions, adding symlinks to stuff outside the data directory, and adding bind mounts in various ways. This is to prove that k0's reset will never delete anything that is not beneath the data directory. Signed-off-by: Tom Wieczorek <[email protected]>
16 tasks
|
This pull request has merge conflicts that need to be resolved. |
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.
Description
Storage drivers and others may hard code /var/lib/kubelet which
conflicts with the k0s default /var/lib/k0s/kubelet. Allow users to
override the kubelet root directory with --kubelet-root-dir similar to
the way they can override --data-dir.
For backwards compatibility we keep the default to be
<datadir>/kubelet.Also fix unmounting when deleting directories in
k0s resetwhile at it.Fixes #1842
Fixes #4318
Type of change
How Has This Been Tested?
Checklist: