github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #93702 from thtanaka/feature/fix-kubeadm-reset

Browse Source 
kubeadm: reset don't unmount /var/lib/kubelet if it is mounted
This commit is contained in:
Kubernetes Prow Robot 2020-09-01 23:13:08 -07:00 committed by GitHub
commit 27df218c72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kubeadm/app/cmd/phases/reset/unmount_linux.go
View File

@ -32,6 +32,12 @@ func unmountKubeletDirectory(absoluteKubeletRunDirectory string) error {
if err != nil { if err != nil {
return err return err
} }
if !strings.HasSuffix(absoluteKubeletRunDirectory, "/") {
// trailing "/" is needed to ensure that possibly mounted /var/lib/kubelet is skipped
absoluteKubeletRunDirectory += "/"
}
mounts := strings.Split(string(raw), "\n") mounts := strings.Split(string(raw), "\n")
for _, mount := range mounts { for _, mount := range mounts {
m := strings.Split(mount, " ") m := strings.Split(mount, " ")