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

Add support for setting kubelet root directory #5186

Merged
merged 3 commits into from
Jan 6, 2025

Conversation

ncopa
Copy link
Collaborator

@ncopa ncopa commented Nov 7, 2024

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 reset while at it.

Fixes #1842
Fixes #4318

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist:

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

@ncopa ncopa requested review from a team as code owners November 7, 2024 12:25
@ncopa ncopa requested review from kke and juanluisvaladas November 7, 2024 12:25
@ncopa ncopa marked this pull request as draft November 7, 2024 12:25
@ncopa ncopa added this to the 1.32 milestone Nov 7, 2024
@ncopa ncopa force-pushed the kubelet-root-dir branch 3 times, most recently from adcc12e to 2d7aed2 Compare November 7, 2024 21:18
Copy link
Contributor

This pull request has merge conflicts that need to be resolved.

Copy link
Contributor

The PR is marked as stale since no activity has been recorded in 30 days

@github-actions github-actions bot added Stale and removed Stale labels Dec 16, 2024
@ncopa ncopa marked this pull request as ready for review December 18, 2024 10:44
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 <ncopa@mirantis.com>
Use --kubelet-root-dir for the inttests:
- kubeletcertrotate
- reset

Signed-off-by: Natanael Copa <ncopa@mirantis.com>
@ncopa ncopa force-pushed the kubelet-root-dir branch 2 times, most recently from 2fba927 to 2078d84 Compare December 19, 2024 14:09
@ncopa ncopa self-assigned this Jan 2, 2025
Signed-off-by: Natanael Copa <ncopa@mirantis.com>
@ncopa ncopa force-pushed the kubelet-root-dir branch from 2078d84 to 8c30737 Compare January 6, 2025 13:38
}
kubeletRootDir, err = filepath.Abs(kubeletRootDir)
if err != nil {
return nil, fmt.Errorf("invalid kubeletRootDir: %w", err)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

filepath.Abs can only fail if the process working directory can't be determined, so the wrapped error message is kinda misleading.

Suggested change
return nil, fmt.Errorf("invalid kubeletRootDir: %w", err)
return err

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
c, err := NewCfgVars(tt.fakeCmd, tt.dirs...)
assert.NoError(t, err)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
assert.NoError(t, err)
require.NoError(t, err)

c, err := NewCfgVars(tt.fakeCmd, tt.dirs...)
assert.NoError(t, err)
expected, err := filepath.Abs(filepath.Join(tt.expected.KubeletRootDir))
assert.NoError(t, err)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
assert.NoError(t, err)
require.NoError(t, err)

@ncopa ncopa merged commit d0d3c49 into k0sproject:main Jan 6, 2025
92 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.

k0s reset deleted all data on persistent volumes k0s should move /var/lib/k0s/kubelet to /var/lib/kubelet
2 participants