Skip to content

K
k3s
Unverified Commit 7098f1ad authored by k8s-ci-robot's avatar k8s-ci-robot Committed by GitHub
Browse files
Options

Merge pull request #71382 from yagonobre/fix-reset

Fix kubeadm reset in case of external etcd
parents 94759c16 52835fbc
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cmd/kubeadm/app/cmd/reset.go
View file @ 7098f1ad
...@@ -207,7 +207,7 @@ func getEtcdDataDir(manifestPath string, client clientset.Interface) (string, er ...@@ -207,7 +207,7 @@ func getEtcdDataDir(manifestPath string, client clientset.Interface) (string, er
if client != nil { if client != nil {
cfg, err := configutil.FetchConfigFromFileOrCluster(client, os.Stdout, "reset", "", false) 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 return cfg.Etcd.Local.DataDir, nil
} }
klog.Warningf("[reset] Unable to fetch the kubeadm-config ConfigMap, using etcd pod spec as fallback: %v", err) klog.Warningf("[reset] Unable to fetch the kubeadm-config ConfigMap, using etcd pod spec as fallback: %v", err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment