From 2e2d0845cd99fcf55246655cbef970b877dd536c Mon Sep 17 00:00:00 2001 From: Thomas Tanaka Date: Tue, 4 Aug 2020 18:45:53 -0700 Subject: [PATCH] kubeadm: reset don't unmount /var/lib/kubelet if it is mounted Previous PR that fixes this https://github.com/kubernetes/kubernetes/pull/71663 Signed-off-by: Thomas Tanaka --- cmd/kubeadm/app/cmd/phases/reset/unmount_linux.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmd/kubeadm/app/cmd/phases/reset/unmount_linux.go b/cmd/kubeadm/app/cmd/phases/reset/unmount_linux.go index 84ba5db2e55..7d92d445547 100644 --- a/cmd/kubeadm/app/cmd/phases/reset/unmount_linux.go +++ b/cmd/kubeadm/app/cmd/phases/reset/unmount_linux.go @@ -32,6 +32,12 @@ func unmountKubeletDirectory(absoluteKubeletRunDirectory string) error { if err != nil { 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") for _, mount := range mounts { m := strings.Split(mount, " ")