Merge pull request #596 from MUzairS15/MUzairS15/fix-logic

fix error handling
meshery · Sep 27, 2024 · a8d2a6d · a8d2a6d
2 parents 6fd2108 + 08164fd
commit a8d2a6d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/utils/kubernetes/client.go b/utils/kubernetes/client.go
@@ -21,13 +21,13 @@ func DetectKubeConfig(configfile []byte) (config *rest.Config, err error) {
 		}
 
 		if config, err = clientcmd.RESTConfigFromKubeConfig(cfgFile); err == nil {
-			return config, ErrRestConfigFromKubeConfig(err)
+			return config, nil
 		}
 	}
 
 	// If deployed within the cluster
 	if config, err = rest.InClusterConfig(); err == nil {
-		return config, ErrRestConfigFromKubeConfig(err)
+		return config, nil
 	}
 
 	// Look for kubeconfig from the path mentioned in $KUBECONFIG
@@ -38,7 +38,7 @@ func DetectKubeConfig(configfile []byte) (config *rest.Config, err error) {
 			return nil, err
 		}
 		if config, err = clientcmd.RESTConfigFromKubeConfig(cfgFile); err == nil {
-			return config, ErrRestConfigFromKubeConfig(err)
+			return config, nil
 		}
 	}
 
@@ -49,10 +49,10 @@ func DetectKubeConfig(configfile []byte) (config *rest.Config, err error) {
 		return nil, err
 	}
 	if config, err = clientcmd.RESTConfigFromKubeConfig(cfgFile); err == nil {
-		return config, ErrRestConfigFromKubeConfig(err)
+		return config, nil
 	}
 
-	return
+	return nil, ErrRestConfigFromKubeConfig(err)
 }
 
 // ProcessConfig handles loading, validating, and optionally saving or returning a kubeconfig