github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: fix some mistakes about log output

Browse Source
This commit is contained in:
SataQiu 2020-04-15 14:32:46 +08:00
parent d0183703cb
commit 004a61a46c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ func runRemoveETCDMemberPhase(c workflow.RunData) error {
r.AddDirsToClean(etcdDataDir) r.AddDirsToClean(etcdDataDir)
if cfg != nil { if cfg != nil {
if err := etcdphase.RemoveStackedEtcdMemberFromCluster(r.Client(), cfg); err != 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 { } else {

2
cmd/kubeadm/app/util/etcd/etcd.go
View File

@ -113,7 +113,7 @@ func NewFromCluster(client clientset.Interface, certificatesDir string) (*Client
// synchronizes client's endpoints with the known endpoints from the etcd membership. // synchronizes client's endpoints with the known endpoints from the etcd membership.
err = etcdClient.Sync() err = etcdClient.Sync()
if err != nil { 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, ",")) klog.V(1).Infof("update etcd endpoints: %s", strings.Join(etcdClient.Endpoints, ","))