Merge pull request #41183 from xilabao/fix-ca-cert-in-kubeadm

Automatic merge from submit-queue (batch tested with PRs 40917, 41181, 41123, 36592, 41183) fix ca cert in kubeadm [certificates] Valid certificates and keys now exist in "/etc/kubernetes/pki"

Merge pull request #41183 from xilabao/fix-ca-cert-in-kubeadm
e1720af7 · Kubernetes Submit Queue · GitHub · 85b4d2e5 · ab72934a · e1720af7
Commit e1720af7 authored Feb 09, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 09, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

reset.go cmd/kubeadm/app/cmd/reset.go +0 -2

checks.go cmd/kubeadm/app/preflight/checks.go +1 -1

No files found.
--- 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 {

--- 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},