From 5a8174bd4564dbfebe57dbbc7277e34a21ed5cf9 Mon Sep 17 00:00:00 2001 From: PingWang Date: Mon, 25 Mar 2019 10:07:47 +0800 Subject: [PATCH] Add some logs for kubeadm join Signed-off-by: PingWang --- cmd/kubeadm/app/cmd/phases/join/kubelet.go | 5 +++-- cmd/kubeadm/app/cmd/phases/join/preflight.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/kubeadm/app/cmd/phases/join/kubelet.go b/cmd/kubeadm/app/cmd/phases/join/kubelet.go index 65270712b00..4bb709c7f90 100644 --- a/cmd/kubeadm/app/cmd/phases/join/kubelet.go +++ b/cmd/kubeadm/app/cmd/phases/join/kubelet.go @@ -101,8 +101,8 @@ func runKubeletStartJoinPhase(c workflow.RunData) error { } bootstrapKubeConfigFile := kubeadmconstants.GetBootstrapKubeletKubeConfigPath() - // Write the bootstrap kubelet config file or the TLS-Boostrapped kubelet config file down to disk - klog.V(1).Infoln("[kubelet-start] writing bootstrap kubelet config file at", bootstrapKubeConfigFile) + // Write the bootstrap kubelet config file or the TLS-Bootstrapped kubelet config file down to disk + klog.V(1).Infof("[kubelet-start] writing bootstrap kubelet config file at %s", bootstrapKubeConfigFile) if err := kubeconfigutil.WriteToDisk(bootstrapKubeConfigFile, tlsBootstrapCfg); err != nil { return errors.Wrap(err, "couldn't save bootstrap-kubelet.conf to disk") } @@ -110,6 +110,7 @@ func runKubeletStartJoinPhase(c workflow.RunData) error { // Write the ca certificate to disk so kubelet can use it for authentication cluster := tlsBootstrapCfg.Contexts[tlsBootstrapCfg.CurrentContext].Cluster if _, err := os.Stat(cfg.CACertPath); os.IsNotExist(err) { + klog.V(1).Infof("[kubelet-start] writing CA certificate at %s", cfg.CACertPath) if err := certutil.WriteCert(cfg.CACertPath, tlsBootstrapCfg.Clusters[cluster].CertificateAuthorityData); err != nil { return errors.Wrap(err, "couldn't save the CA certificate to disk") } diff --git a/cmd/kubeadm/app/cmd/phases/join/preflight.go b/cmd/kubeadm/app/cmd/phases/join/preflight.go index 8c49c6f7294..8c478ebe648 100644 --- a/cmd/kubeadm/app/cmd/phases/join/preflight.go +++ b/cmd/kubeadm/app/cmd/phases/join/preflight.go @@ -118,7 +118,7 @@ func runPreflight(c workflow.RunData) error { return errors.New(msg.String()) } - // run kubeadm init preflight checks for checking all the prequisites + // run kubeadm init preflight checks for checking all the prerequisites fmt.Println("[preflight] Running pre-flight checks before initializing the new control plane instance") if err := preflight.RunInitNodeChecks(utilsexec.New(), initCfg, j.IgnorePreflightErrors()); err != nil { return err