From 59d131d6124c8fac6400c05be4d74a82af5fd63d Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Fri, 9 Feb 2018 15:33:43 +0200 Subject: [PATCH] Remove bootstrap kubelet config on reset Made sure /etc/kubernetes/bootstrap-kubelet.conf is removed to ensure it will not be reused when joining the cluster next time. --- cmd/kubeadm/app/cmd/reset.go | 1 + cmd/kubeadm/app/preflight/checks.go | 1 + 2 files changed, 2 insertions(+) diff --git a/cmd/kubeadm/app/cmd/reset.go b/cmd/kubeadm/app/cmd/reset.go index 6b43088895c..2e950fa87e7 100644 --- a/cmd/kubeadm/app/cmd/reset.go +++ b/cmd/kubeadm/app/cmd/reset.go @@ -252,6 +252,7 @@ func resetConfigDir(configPathDir, pkiPathDir string) { filesToClean := []string{ filepath.Join(configPathDir, kubeadmconstants.AdminKubeConfigFileName), filepath.Join(configPathDir, kubeadmconstants.KubeletKubeConfigFileName), + filepath.Join(configPathDir, kubeadmconstants.KubeletBootstrapKubeConfigFileName), filepath.Join(configPathDir, kubeadmconstants.ControllerManagerKubeConfigFileName), filepath.Join(configPathDir, kubeadmconstants.SchedulerKubeConfigFileName), } diff --git a/cmd/kubeadm/app/preflight/checks.go b/cmd/kubeadm/app/preflight/checks.go index 9add920416f..68ace4f0a66 100644 --- a/cmd/kubeadm/app/preflight/checks.go +++ b/cmd/kubeadm/app/preflight/checks.go @@ -975,6 +975,7 @@ func RunJoinNodeChecks(execer utilsexec.Interface, cfg *kubeadmapi.NodeConfigura DirAvailableCheck{Path: filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.ManifestsSubDirName)}, FileAvailableCheck{Path: cfg.CACertPath}, FileAvailableCheck{Path: filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.KubeletKubeConfigFileName)}, + FileAvailableCheck{Path: filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.KubeletBootstrapKubeConfigFileName)}, } if useCRI { checks = append(checks, CRICheck{socket: criSocket, exec: execer})