From 6ca14282562597709c909e9f7f3abdb600afc193 Mon Sep 17 00:00:00 2001 From: Xianglin Gao Date: Fri, 27 Jul 2018 00:02:08 +0800 Subject: [PATCH] Use KubeletRunDirectory instead of hard-coded way Signed-off-by: Xianglin Gao --- cmd/kubeadm/app/cmd/reset.go | 10 +++++----- cmd/kubeadm/app/constants/constants.go | 1 - cmd/kubeadm/app/phases/kubelet/BUILD | 1 + cmd/kubeadm/app/phases/kubelet/flags_test.go | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cmd/kubeadm/app/cmd/reset.go b/cmd/kubeadm/app/cmd/reset.go index 60a5307ffe4..a26ff023b39 100644 --- a/cmd/kubeadm/app/cmd/reset.go +++ b/cmd/kubeadm/app/cmd/reset.go @@ -138,21 +138,21 @@ func (r *Reset) Run(out io.Writer) error { } } - // Try to unmount mounted directories under /var/lib/kubelet in order to be able to remove the /var/lib/kubelet directory later - fmt.Printf("[reset] unmounting mounted directories in %q\n", "/var/lib/kubelet") - umountDirsCmd := "awk '$2 ~ path {print $2}' path=/var/lib/kubelet /proc/mounts | xargs -r umount" + // Try to unmount mounted directories under kubeadmconstants.KubeletRunDirectory in order to be able to remove the kubeadmconstants.KubeletRunDirectory directory later + fmt.Printf("[reset] unmounting mounted directories in %q\n", kubeadmconstants.KubeletRunDirectory) + umountDirsCmd := fmt.Sprintf("awk '$2 ~ path {print $2}' path=%s /proc/mounts | xargs -r umount", kubeadmconstants.KubeletRunDirectory) glog.V(1).Infof("[reset] executing command %q", umountDirsCmd) umountOutputBytes, err := exec.Command("sh", "-c", umountDirsCmd).Output() if err != nil { - glog.Errorf("[reset] failed to unmount mounted directories in /var/lib/kubelet: %s\n", string(umountOutputBytes)) + glog.Errorf("[reset] failed to unmount mounted directories in %s: %s\n", kubeadmconstants.KubeletRunDirectory, string(umountOutputBytes)) } glog.V(1).Info("[reset] removing kubernetes-managed containers") if err := removeContainers(utilsexec.New(), r.criSocketPath); err != nil { glog.Errorf("[reset] failed to remove containers: %+v", err) } - dirsToClean := []string{"/var/lib/kubelet", "/etc/cni/net.d", "/var/lib/dockershim", "/var/run/kubernetes"} + dirsToClean := []string{kubeadmconstants.KubeletRunDirectory, "/etc/cni/net.d", "/var/lib/dockershim", "/var/run/kubernetes"} // Only clear etcd data when the etcd manifest is found. In case it is not found, we must assume that the user // provided external etcd endpoints. In that case, it is their own responsibility to reset etcd diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 4ff4e8eee11..b48cd4effd9 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -202,7 +202,6 @@ const ( KubeletBaseConfigMapRolePrefix = "kubeadm:kubelet-config-" // KubeletRunDirectory specifies the directory where the kubelet runtime information is stored. - // TODO: Make hard-coded "/var/lib/kubelet" strings reference this constant. KubeletRunDirectory = "/var/lib/kubelet" // KubeletConfigurationFileName specifies the file name on the node which stores initial remote configuration of kubelet diff --git a/cmd/kubeadm/app/phases/kubelet/BUILD b/cmd/kubeadm/app/phases/kubelet/BUILD index e44834674c4..ffcc960e053 100644 --- a/cmd/kubeadm/app/phases/kubelet/BUILD +++ b/cmd/kubeadm/app/phases/kubelet/BUILD @@ -44,6 +44,7 @@ go_test( embed = [":go_default_library"], deps = [ "//cmd/kubeadm/app/apis/kubeadm:go_default_library", + "//cmd/kubeadm/app/constants:go_default_library", "//pkg/kubelet/apis:go_default_library", "//pkg/kubelet/apis/kubeletconfig:go_default_library", "//pkg/util/version:go_default_library", diff --git a/cmd/kubeadm/app/phases/kubelet/flags_test.go b/cmd/kubeadm/app/phases/kubelet/flags_test.go index 815090ce6c4..6fa178b555f 100644 --- a/cmd/kubeadm/app/phases/kubelet/flags_test.go +++ b/cmd/kubeadm/app/phases/kubelet/flags_test.go @@ -27,6 +27,7 @@ import ( "k8s.io/api/core/v1" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/utils/exec" ) @@ -249,7 +250,7 @@ func TestBuildKubeletArgMap(t *testing.T) { expected: map[string]string{ "container-runtime": "remote", "container-runtime-endpoint": "/var/run/containerd.sock", - "dynamic-config-dir": "/var/lib/kubelet/dynamic-config", + "dynamic-config-dir": fmt.Sprintf("%s/dynamic-config", kubeadmconstants.KubeletRunDirectory), }, }, }