Merge pull request kubernetes#71382 from yagonobre/fix-reset

Fix kubeadm reset in case of external etcd
jjo · Nov 24, 2018 · 7098f1a · 7098f1a
2 parents 94759c1 + 52835fb
commit 7098f1a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cmd/kubeadm/app/cmd/reset.go b/cmd/kubeadm/app/cmd/reset.go
@@ -207,7 +207,7 @@ func getEtcdDataDir(manifestPath string, client clientset.Interface) (string, er
 
 	if client != nil {
 		cfg, err := configutil.FetchConfigFromFileOrCluster(client, os.Stdout, "reset", "", false)
-		if err == nil {
+		if err == nil && cfg.Etcd.Local != nil {
 			return cfg.Etcd.Local.DataDir, nil
 		}
 		klog.Warningf("[reset] Unable to fetch the kubeadm-config ConfigMap, using etcd pod spec as fallback: %v", err)