github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #76557 from SataQiu/clean-kubeadm-20190414 

Capitalize the first letter of the prompt for consistency
k3s-v1.15.3
Kubernetes Prow Robot 2019-04-14 03:30:00 -07:00 committed by GitHub
parent 7d375f5f00 8b7b2349c7
commit 8c4651cc41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/reset.go
View File

@ -178,7 +178,7 @@ func (r *Reset) Run(out io.Writer, client clientset.Interface, cfg *kubeadmapi.I
}
// Try to unmount mounted directories under kubeadmconstants.KubeletRunDirectory in order to be able to remove the kubeadmconstants.KubeletRunDirectory directory later
fmt.Printf("[reset] unmounting mounted directories in %q\n", kubeadmconstants.KubeletRunDirectory)
fmt.Printf("[reset] Unmounting mounted directories in %q\n", kubeadmconstants.KubeletRunDirectory)
umountDirsCmd := fmt.Sprintf("awk '$2 ~ path {print $2}' path=%s/ /proc/mounts | xargs -r umount", kubeadmconstants.KubeletRunDirectory)
klog.V(1).Infof("[reset] Executing command %q", umountDirsCmd)

2
cmd/kubeadm/app/phases/bootstraptoken/clusterinfo/clusterinfo.go
View File

@ -41,7 +41,7 @@ const (
// CreateBootstrapConfigMapIfNotExists creates the kube-public ConfigMap if it doesn't exist already
func CreateBootstrapConfigMapIfNotExists(client clientset.Interface, file string) error {
fmt.Printf("[bootstrap-token] creating the %q ConfigMap in the %q namespace\n", bootstrapapi.ConfigMapClusterInfo, metav1.NamespacePublic)
fmt.Printf("[bootstrap-token] Creating the %q ConfigMap in the %q namespace\n", bootstrapapi.ConfigMapClusterInfo, metav1.NamespacePublic)
klog.V(1).Infoln("[bootstrap-token] loading admin kubeconfig")
adminConfig, err := clientcmd.LoadFromFile(file)

2
cmd/kubeadm/app/phases/certs/renewal/certsapi.go
View File

@ -95,7 +95,7 @@ func (r *CertsAPIRenewal) Renew(cfg *certutil.Config) (*x509.Certificate, *rsa.P
return nil, nil, errors.Wrap(err, "couldn't create certificate signing request")
}
fmt.Printf("[certs] certificate request %q created\n", req.Name)
fmt.Printf("[certs] Certificate request %q created\n", req.Name)
certData, err := csrutil.WaitForCertificate(r.client.CertificateSigningRequests(), req, watchTimeout)
if err != nil {

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

@ -39,7 +39,7 @@ func TryStartKubelet() {
// This runs "systemctl daemon-reload && systemctl restart kubelet"
if err := initSystem.ServiceRestart("kubelet"); err != nil {
fmt.Printf("[kubelet-start] WARNING: unable to start the kubelet service: [%v]\n", err)
fmt.Printf("[kubelet-start] please ensure kubelet is reloaded and running manually.\n")
fmt.Printf("[kubelet-start] Please ensure kubelet is reloaded and running manually.\n")
}
}

4
cmd/kubeadm/app/phases/upgrade/staticpods.go
View File

@ -195,7 +195,7 @@ func upgradeComponent(component string, waiter apiclient.Waiter, pathMgr StaticP
return err
}
if equal {
fmt.Printf("[upgrade/staticpods] current and new manifests of %s are equal, skipping upgrade\n", component)
fmt.Printf("[upgrade/staticpods] Current and new manifests of %s are equal, skipping upgrade\n", component)
return nil
}
@ -425,7 +425,7 @@ func StaticPodControlPlane(client clientset.Interface, waiter apiclient.Waiter,
if fatal {
return err
}
fmt.Printf("[upgrade/etcd] non fatal issue encountered during upgrade: %v\n", err)
fmt.Printf("[upgrade/etcd] Non fatal issue encountered during upgrade: %v\n", err)
}
}

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

@ -104,7 +104,7 @@ func ResetClusterStatusForNode(nodeName string, client clientset.Interface) erro
// UploadConfiguration saves the InitConfiguration used for later reference (when upgrading for instance)
func UploadConfiguration(cfg *kubeadmapi.InitConfiguration, client clientset.Interface) error {
fmt.Printf("[upload-config] storing the configuration used in ConfigMap %q in the %q Namespace\n", kubeadmconstants.KubeadmConfigConfigMap, metav1.NamespaceSystem)
fmt.Printf("[upload-config] Storing the configuration used in ConfigMap %q in the %q Namespace\n", kubeadmconstants.KubeadmConfigConfigMap, metav1.NamespaceSystem)
// Prepare the ClusterConfiguration for upload
// The components store their config in their own ConfigMaps, then reset the .ComponentConfig struct;