Merge pull request #64850 from carldanley/improve-kubeadm-reset-logging

Automatic merge from submit-queue (batch tested with PRs 65254, 64837, 64782, 64555, 64850). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Improve kubeadm reset output **What this PR does / why we need it**: Improves logging when using `kubeadm reset` + external etcd **Which issue(s) this PR fixes**: Fixes https://github.com/kubernetes/kubeadm/issues/859

Merge pull request #64850 from carldanley/improve-kubeadm-reset-logging
051ed101 · Kubernetes Submit Queue · GitHub · 1bdee563 · 0bfcb5cb · 051ed101
Unverified Commit 051ed101 authored Jun 20, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

reset.go cmd/kubeadm/app/cmd/reset.go +1 -0

No files found.
--- a/cmd/kubeadm/app/cmd/reset.go
+++ b/cmd/kubeadm/app/cmd/reset.go
@@ -164,6 +164,7 @@ func (r *Reset) Run(out io.Writer) error {
 		dirsToClean = append(dirsToClean, "/var/lib/etcd")
 	} else {
 		fmt.Printf("[reset] no etcd manifest found in %q. Assuming external etcd\n", etcdManifestPath)
+		fmt.Println("[reset] please manually reset etcd to prevent further issues")
 	}

 	// Then clean contents from the stateful kubelet, etcd and cni directories