diff --git a/cmd/kubeadm/app/cmd/phases/init/kubeconfig.go b/cmd/kubeadm/app/cmd/phases/init/kubeconfig.go index f2f6b7d3cb4..7f7979f2855 100644 --- a/cmd/kubeadm/app/cmd/phases/init/kubeconfig.go +++ b/cmd/kubeadm/app/cmd/phases/init/kubeconfig.go @@ -38,7 +38,7 @@ var ( short: "Generate a kubeconfig file for the admin to use and for kubeadm itself", long: "Generate the kubeconfig file for the admin and for kubeadm itself, and save it to %s file.", }, - kubeadmconstants.KubeletKubeConfigFileName: { + kubeadmconstants.KubeletBootstrapKubeConfigFileName: { name: "kubelet", short: "Generate a kubeconfig file for the kubelet to use *only* for cluster bootstrapping purposes", long: cmdutil.LongDesc(` @@ -74,7 +74,7 @@ func NewKubeConfigPhase() workflow.Phase { RunAllSiblings: true, }, NewKubeConfigFilePhase(kubeadmconstants.AdminKubeConfigFileName), - NewKubeConfigFilePhase(kubeadmconstants.KubeletKubeConfigFileName), + NewKubeConfigFilePhase(kubeadmconstants.KubeletBootstrapKubeConfigFileName), NewKubeConfigFilePhase(kubeadmconstants.ControllerManagerKubeConfigFileName), NewKubeConfigFilePhase(kubeadmconstants.SchedulerKubeConfigFileName), }, @@ -103,7 +103,7 @@ func getKubeConfigPhaseFlags(name string) []string { options.KubeconfigDir, options.KubernetesVersion, } - if name == "all" || name == kubeadmconstants.KubeletKubeConfigFileName { + if name == "all" || name == kubeadmconstants.KubeletBootstrapKubeConfigFileName { flags = append(flags, options.NodeName, ) diff --git a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go index 90128f472d7..dad8d4bf1fe 100644 --- a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go +++ b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go @@ -136,7 +136,7 @@ func getKubeConfigSpecs(cfg *kubeadmapi.InitConfiguration) (map[string]*kubeConf Organizations: []string{kubeadmconstants.SystemPrivilegedGroup}, }, }, - kubeadmconstants.KubeletKubeConfigFileName: { + kubeadmconstants.KubeletBootstrapKubeConfigFileName: { CACert: caCert, APIServer: controlPlaneEndpoint, ClientName: fmt.Sprintf("%s%s", kubeadmconstants.NodesUserPrefix, cfg.NodeRegistration.Name), @@ -348,7 +348,7 @@ func writeKubeConfigFromSpec(out io.Writer, spec *kubeConfigSpec, clustername st func ValidateKubeconfigsForExternalCA(outDir string, cfg *kubeadmapi.InitConfiguration) error { kubeConfigFileNames := []string{ kubeadmconstants.AdminKubeConfigFileName, - kubeadmconstants.KubeletKubeConfigFileName, + kubeadmconstants.KubeletBootstrapKubeConfigFileName, kubeadmconstants.ControllerManagerKubeConfigFileName, kubeadmconstants.SchedulerKubeConfigFileName, }