From 004a61a46cf2ebec2a7ef25bfcff475a7578ca64 Mon Sep 17 00:00:00 2001 From: SataQiu <1527062125@qq.com> Date: Wed, 15 Apr 2020 14:32:46 +0800 Subject: [PATCH] kubeadm: fix some mistakes about log output --- cmd/kubeadm/app/cmd/phases/reset/removeetcdmember.go | 2 +- cmd/kubeadm/app/util/etcd/etcd.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/cmd/phases/reset/removeetcdmember.go b/cmd/kubeadm/app/cmd/phases/reset/removeetcdmember.go index f2e60cfe978..4100c96475b 100644 --- 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 index 56f925b8745..15b565930ad 100644 --- 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, ","))