Skip to content

Don't unmount kubelet-root-dir on k0s reset #6472

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Don't unmount kubelet-root-dir on k0s reset #6472

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions pkg/cleanup/directories.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ func (d *directories) Run() error {
}

var dataDirMounted bool
var kubeletRootDirMounted bool

// ensure that we don't delete any persistent data volumes that may be
// mounted by kubernetes by unmount every mount point under DataDir.
Expand All @@ -60,6 +61,12 @@ func (d *directories) Run() error {
dataDirMounted = true
continue
}
// avoid unmount kubeletRootDir if its mounted on separate partition
// k0s didn't mount it so leave it alone
if v.Path == d.kubeletRootDir {
kubeletRootDirMounted = true
continue
}
if isUnderPath(v.Path, d.kubeletRootDir) || isUnderPath(v.Path, d.dataDir) {
logrus.Debugf("%v is mounted! attempting to unmount...", v.Path)
if err = mounter.Unmount(v.Path); err != nil {
Expand All @@ -74,9 +81,19 @@ func (d *directories) Run() error {
}
}

logrus.Debugf("removing kubelet root dir (%s)", d.kubeletRootDir)
if kubeletRootDirMounted {
logrus.Debugf("removing the contents of mounted kubelet-root-dir (%s)", d.kubeletRootDir)
} else {
logrus.Debugf("removing kubelet root dir (%s)", d.kubeletRootDir)
}

if err := os.RemoveAll(d.kubeletRootDir); err != nil {
return fmt.Errorf("failed to delete k0s kubelet root direcotory: %w", err)
if !kubeletRootDirMounted {
return fmt.Errorf("failed to delete k0s kubelet root direcotory: %w", err)
}
if !errorIsUnlinkat(err, d.kubeletRootDir) {
return fmt.Errorf("failed to delete contents of mounted kubelet-root-dir: %w", err)
}
}

if dataDirMounted {
Expand Down
Loading