From ab72934a92717176f2fa8f901fec61238c562134 Mon Sep 17 00:00:00 2001 From: xilabao Date: Thu, 9 Feb 2017 10:48:31 +0800 Subject: [PATCH] fix ca cert in kubeadm --- cmd/kubeadm/app/cmd/reset.go | 2 -- cmd/kubeadm/app/preflight/checks.go | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cmd/kubeadm/app/cmd/reset.go b/cmd/kubeadm/app/cmd/reset.go index 813ca534e63..5eee9972394 100644 --- a/cmd/kubeadm/app/cmd/reset.go +++ b/cmd/kubeadm/app/cmd/reset.go @@ -27,7 +27,6 @@ import ( "github.com/spf13/cobra" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubeconfig" "k8s.io/kubernetes/cmd/kubeadm/app/preflight" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" @@ -224,7 +223,6 @@ func resetConfigDir(configPathDir, pkiPathDir string) { filesToClean := []string{ filepath.Join(configPathDir, kubeconfig.AdminKubeConfigFileName), filepath.Join(configPathDir, kubeconfig.KubeletKubeConfigFileName), - filepath.Join(configPathDir, kubeadmconstants.CACertName), } fmt.Printf("[reset] Deleting files: %v\n", filesToClean) for _, path := range filesToClean { diff --git a/cmd/kubeadm/app/preflight/checks.go b/cmd/kubeadm/app/preflight/checks.go index 544720a13f0..cff64a87065 100644 --- a/cmd/kubeadm/app/preflight/checks.go +++ b/cmd/kubeadm/app/preflight/checks.go @@ -361,7 +361,7 @@ func RunJoinNodeChecks(cfg *kubeadmapi.NodeConfiguration) error { PortOpenCheck{port: 10250}, DirAvailableCheck{Path: filepath.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, "manifests")}, DirAvailableCheck{Path: "/var/lib/kubelet"}, - FileAvailableCheck{Path: filepath.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, kubeadmconstants.CACertName)}, + FileAvailableCheck{Path: filepath.Join(kubeadmapi.GlobalEnvParams.HostPKIPath, kubeadmconstants.CACertName)}, FileAvailableCheck{Path: filepath.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, kubeconfig.KubeletKubeConfigFileName)}, FileContentCheck{Path: bridgenf, Content: []byte{'1'}}, InPathCheck{executable: "ip", mandatory: true},