Merge pull request kubernetes#90163 from SataQiu/fix-kubeadm-20200415

k8s-ci-robot · web-flow · commit b30bfa6f764f · 2020-04-15T11:36:33.000-07:00
kubeadm: fix some mistakes about log output
diff --git a/cmd/kubeadm/app/cmd/phases/reset/removeetcdmember.go b/cmd/kubeadm/app/cmd/phases/reset/removeetcdmember.go
@@ -58,7 +58,7 @@ func runRemoveETCDMemberPhase(c workflow.RunData) error {
 		r.AddDirsToClean(etcdDataDir)
 		if cfg != nil {
 			if err := etcdphase.RemoveStackedEtcdMemberFromCluster(r.Client(), cfg); err != nil {
-				klog.Warningf("[reset] failed to remove etcd member: %v\n.Please manually remove this etcd member using etcdctl", err)
+				klog.Warningf("[reset] failed to remove etcd member: %v, please manually remove this etcd member using etcdctl", err)
 			}
 		}
 	} else {
diff --git a/cmd/kubeadm/app/util/etcd/etcd.go b/cmd/kubeadm/app/util/etcd/etcd.go
@@ -113,7 +113,7 @@ func NewFromCluster(client clientset.Interface, certificatesDir string) (*Client
 	// synchronizes client's endpoints with the known endpoints from the etcd membership.
 	err = etcdClient.Sync()
 	if err != nil {
-		return nil, errors.Wrap(err, "error syncing endpoints with etc")
+		return nil, errors.Wrap(err, "error syncing endpoints with etcd")
 	}
 	klog.V(1).Infof("update etcd endpoints: %s", strings.Join(etcdClient.Endpoints, ","))
 

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func runRemoveETCDMemberPhase(c workflow.RunData) error {`
`58`	`58`	`r.AddDirsToClean(etcdDataDir)`
`59`	`59`	`if cfg != nil {`
`60`	`60`	`if err := etcdphase.RemoveStackedEtcdMemberFromCluster(r.Client(), cfg); err != nil {`
`61`		`- klog.Warningf("[reset] failed to remove etcd member: %v\n.Please manually remove this etcd member using etcdctl", err)`
	`61`	`+ klog.Warningf("[reset] failed to remove etcd member: %v, please manually remove this etcd member using etcdctl", err)`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ func NewFromCluster(client clientset.Interface, certificatesDir string) (*Client`
`113`	`113`	`// synchronizes client's endpoints with the known endpoints from the etcd membership.`
`114`	`114`	`err = etcdClient.Sync()`
`115`	`115`	`if err != nil {`
`116`		`- return nil, errors.Wrap(err, "error syncing endpoints with etc")`
	`116`	`+ return nil, errors.Wrap(err, "error syncing endpoints with etcd")`
`117`	`117`	`}`
`118`	`118`	`klog.V(1).Infof("update etcd endpoints: %s", strings.Join(etcdClient.Endpoints, ","))`
`119`	`119`