github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: write boostrap-kubelet.conf during init

Browse Source
This commit is contained in:
Lubomir I. Ivanov 2019-09-30 22:40:03 +03:00
parent 24424e26d1
commit 02469a023f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kubeadm/app/cmd/phases/init/kubeconfig.go
View File

@ -38,7 +38,7 @@ var (
short: "Generate a kubeconfig file for the admin to use and for kubeadm itself", 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.", long: "Generate the kubeconfig file for the admin and for kubeadm itself, and save it to %s file.",
}, },
kubeadmconstants.KubeletKubeConfigFileName: { kubeadmconstants.KubeletBootstrapKubeConfigFileName: {
name: "kubelet", name: "kubelet",
short: "Generate a kubeconfig file for the kubelet to use *only* for cluster bootstrapping purposes", short: "Generate a kubeconfig file for the kubelet to use *only* for cluster bootstrapping purposes",
long: cmdutil.LongDesc(` long: cmdutil.LongDesc(`
@ -74,7 +74,7 @@ func NewKubeConfigPhase() workflow.Phase {
RunAllSiblings: true, RunAllSiblings: true,
}, },
NewKubeConfigFilePhase(kubeadmconstants.AdminKubeConfigFileName), NewKubeConfigFilePhase(kubeadmconstants.AdminKubeConfigFileName),
NewKubeConfigFilePhase(kubeadmconstants.KubeletKubeConfigFileName), NewKubeConfigFilePhase(kubeadmconstants.KubeletBootstrapKubeConfigFileName),
NewKubeConfigFilePhase(kubeadmconstants.ControllerManagerKubeConfigFileName), NewKubeConfigFilePhase(kubeadmconstants.ControllerManagerKubeConfigFileName),
NewKubeConfigFilePhase(kubeadmconstants.SchedulerKubeConfigFileName), NewKubeConfigFilePhase(kubeadmconstants.SchedulerKubeConfigFileName),
}, },
@ -103,7 +103,7 @@ func getKubeConfigPhaseFlags(name string) []string {
options.KubeconfigDir, options.KubeconfigDir,
options.KubernetesVersion, options.KubernetesVersion,
} }
if name == "all" || name == kubeadmconstants.KubeletKubeConfigFileName { if name == "all" || name == kubeadmconstants.KubeletBootstrapKubeConfigFileName {
flags = append(flags, flags = append(flags,
options.NodeName, options.NodeName,
) )

4
cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go
View File

@ -136,7 +136,7 @@ func getKubeConfigSpecs(cfg *kubeadmapi.InitConfiguration) (map[string]*kubeConf
Organizations: []string{kubeadmconstants.SystemPrivilegedGroup}, Organizations: []string{kubeadmconstants.SystemPrivilegedGroup},
}, },
}, },
kubeadmconstants.KubeletKubeConfigFileName: { kubeadmconstants.KubeletBootstrapKubeConfigFileName: {
CACert: caCert, CACert: caCert,
APIServer: controlPlaneEndpoint, APIServer: controlPlaneEndpoint,
ClientName: fmt.Sprintf("%s%s", kubeadmconstants.NodesUserPrefix, cfg.NodeRegistration.Name), 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 { func ValidateKubeconfigsForExternalCA(outDir string, cfg *kubeadmapi.InitConfiguration) error {
kubeConfigFileNames := []string{ kubeConfigFileNames := []string{
kubeadmconstants.AdminKubeConfigFileName, kubeadmconstants.AdminKubeConfigFileName,
kubeadmconstants.KubeletKubeConfigFileName, kubeadmconstants.KubeletBootstrapKubeConfigFileName,
kubeadmconstants.ControllerManagerKubeConfigFileName, kubeadmconstants.ControllerManagerKubeConfigFileName,
kubeadmconstants.SchedulerKubeConfigFileName, kubeadmconstants.SchedulerKubeConfigFileName,
} }