kubeadm: fix kubeadm reset logic

If /etc/kubeadm/amdin.conf doesn't exist kubeadm reset fails with the error: failed to load admin kubeconfig: open /root/.kube/config: no such file or directory Fixed by properly checking if file exists before using it.

kubeadm: fix kubeadm reset logic
7a8de82d · Ed Bartosh · 30c7df5c · 7a8de82d
Commit 7a8de82d authored Feb 14, 2019 by Ed Bartosh
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

reset.go cmd/kubeadm/app/cmd/reset.go +10 -6

No files found.
--- a/cmd/kubeadm/app/cmd/reset.go
+++ b/cmd/kubeadm/app/cmd/reset.go
@@ -62,8 +62,10 @@ func NewCmdReset(in io.Reader, out io.Writer) *cobra.Command {
 			kubeadmutil.CheckErr(err)
 			kubeConfigFile = cmdutil.FindExistingKubeConfig(kubeConfigFile)
-			client, err = getClientset(kubeConfigFile, false)
+			if _, err := os.Stat(kubeConfigFile); !os.IsNotExist(err) {
-			kubeadmutil.CheckErr(err)
+				client, err = getClientset(kubeConfigFile, false)
+				kubeadmutil.CheckErr(err)
+			}
 			if criSocketPath == "" {
 				criSocketPath, err = resetDetectCRISocket(client)
@@ -298,10 +300,12 @@ func resetConfigDir(configPathDir, pkiPathDir string) {
 }
 func resetDetectCRISocket(client clientset.Interface) (string, error) {
-	// first try to connect to the cluster for the CRI socket
+	if client != nil {
-	cfg, err := configutil.FetchInitConfigurationFromCluster(client, os.Stdout, "reset", false)
+		// first try to connect to the cluster for the CRI socket
-	if err == nil {
+		cfg, err := configutil.FetchInitConfigurationFromCluster(client, os.Stdout, "reset", false)
-		return cfg.NodeRegistration.CRISocket, nil
+		if err == nil {
+			return cfg.NodeRegistration.CRISocket, nil
+		}
 	}
 	// if this fails, try to detect it