github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kubeadm: reset don't unmount /var/lib/kubelet if it is mounted

Browse Source 
Previous PR that fixes this
https://github.com/kubernetes/kubernetes/pull/71663

Signed-off-by: Thomas Tanaka <thomas.tanaka@gmail.com>
This commit is contained in:
Thomas Tanaka
2020-08-04 18:45:53 -07:00
parent 56c76023f7
commit 2e2d0845cd
1 changed files with 6 additions and 0 deletions
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, " ")