github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix garbled code in kubeadm output

Browse Source
This commit is contained in:
xiangpengzhao 2018-04-16 16:49:55 +08:00
parent 2ef566d0c3
commit b0bdaa3a4c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/cmd/init.go
View File

@ -485,7 +485,7 @@ func (i *Init) Run(out io.Writer) error {
// Exit earlier if we're dryrunning // Exit earlier if we're dryrunning
if i.dryRun { if i.dryRun {
fmt.Println("[dryrun] finished dry-running successfully. Above are the resources that would be created") fmt.Println("[dryrun] finished dry-running successfully. Above are the resources that would be created")
return nil return nil
} }
@ -536,7 +536,7 @@ func printFilesIfDryRunning(dryRun bool, manifestDir string) error {
return nil return nil
} }
glog.Infof("[dryrun] wrote certificates, kubeconfig files and control plane manifests to the %q directory\n", manifestDir) glog.Infof("[dryrun] wrote certificates, kubeconfig files and control plane manifests to the %q directory\n", manifestDir)
glog.Infoln("[dryrun] the certificates or kubeconfig files would not be printed due to their sensitive nature") glog.Infoln("[dryrun] the certificates or kubeconfig files would not be printed due to their sensitive nature")
glog.Infof("[dryrun] please examine the %q directory for details about what would be written\n", manifestDir) glog.Infof("[dryrun] please examine the %q directory for details about what would be written\n", manifestDir)

2
cmd/kubeadm/app/phases/uploadconfig/uploadconfig.go
View File

@ -33,7 +33,7 @@ import (
// UploadConfiguration saves the MasterConfiguration used for later reference (when upgrading for instance) // UploadConfiguration saves the MasterConfiguration used for later reference (when upgrading for instance)
func UploadConfiguration(cfg *kubeadmapi.MasterConfiguration, client clientset.Interface) error { func UploadConfiguration(cfg *kubeadmapi.MasterConfiguration, client clientset.Interface) error {
glog.Infof("[uploadconfig] storing the configuration used in ConfigMap %q in the %q Namespace\n", kubeadmconstants.MasterConfigurationConfigMap, metav1.NamespaceSystem) glog.Infof("[uploadconfig] storing the configuration used in ConfigMap %q in the %q Namespace\n", kubeadmconstants.MasterConfigurationConfigMap, metav1.NamespaceSystem)
// Convert cfg to the external version as that's the only version of the API that can be deserialized later // Convert cfg to the external version as that's the only version of the API that can be deserialized later
externalcfg := &kubeadmapiext.MasterConfiguration{} externalcfg := &kubeadmapiext.MasterConfiguration{}

4
cmd/kubeadm/app/util/dryrun/dryrun.go
View File

@ -81,7 +81,7 @@ func NewWaiter() apiclient.Waiter {
// WaitForAPI just returns a dummy nil, to indicate that the program should just proceed // WaitForAPI just returns a dummy nil, to indicate that the program should just proceed
func (w *Waiter) WaitForAPI() error { func (w *Waiter) WaitForAPI() error {
fmt.Println("[dryrun] Would wait for the API Server's /healthz endpoint to return 'ok'") fmt.Println("[dryrun] Would wait for the API Server's /healthz endpoint to return 'ok'")
return nil return nil
} }
@ -99,7 +99,7 @@ func (w *Waiter) WaitForPodToDisappear(podName string) error {
// WaitForHealthyKubelet blocks until the kubelet /healthz endpoint returns 'ok' // WaitForHealthyKubelet blocks until the kubelet /healthz endpoint returns 'ok'
func (w *Waiter) WaitForHealthyKubelet(_ time.Duration, healthzEndpoint string) error { func (w *Waiter) WaitForHealthyKubelet(_ time.Duration, healthzEndpoint string) error {
fmt.Printf("[dryrun] Would make sure the kubelet %q endpoint is healthy\n", healthzEndpoint) fmt.Printf("[dryrun] Would make sure the kubelet %q endpoint is healthy\n", healthzEndpoint)
return nil return nil
} }