restore original variables

Author: wesjdj

pkg/k8s/client.go

@@ -12,46 +12,45 @@ import (
 	"k8s.io/client-go/util/homedir"
 )
 
-func getConfig() (*rest.Config, error) {
+func GetClientset() (*kubernetes.Clientset, error) {
 	config, err := rest.InClusterConfig()
 	if err == nil {
-		return config, nil
+		return kubernetes.NewForConfig(config)
 	}
 
 	kubeconfig := os.Getenv("KUBECONFIG")
-	if kubeconfig != "" {
-		config, err = clientcmd.BuildConfigFromFlags("", kubeconfig)
-		if err != nil {
-			return nil, err
+	if kubeconfig == "" {
+		home := homedir.HomeDir()
+		if home == "" {
+			return nil, fmt.Errorf("could not determine home directory")
 		}
-		return config, nil
-	}
-
-	home := homedir.HomeDir()
-	if home == "" {
-		return nil, fmt.Errorf("could not determine home directory")
+		kubeconfig = filepath.Join(home, ".kube", "config")
 	}
 
-	kubeconfig = filepath.Join(home, ".kube", "config")
 	config, err = clientcmd.BuildConfigFromFlags("", kubeconfig)
 	if err != nil {
 		return nil, err
 	}
 
-	return config, nil
+	return kubernetes.NewForConfig(config)
 }
 
-func GetClientset() (*kubernetes.Clientset, error) {
-	config, err := getConfig()
-	if err != nil {
-		return nil, err
+func GetDynamicClient() (client *dynamic.DynamicClient, err error) {
+	config, err := rest.InClusterConfig()
+	if err == nil {
+		return dynamic.NewForConfig(config)
 	}
 
-	return kubernetes.NewForConfig(config)
-}
+	kubeconfig := os.Getenv("KUBECONFIG")
+	if kubeconfig == "" {
+		home := homedir.HomeDir()
+		if home == "" {
+			return nil, fmt.Errorf("could not determine home directory")
+		}
+		kubeconfig = filepath.Join(home, ".kube", "config")
+	}
 
-func GetDynamicClient() (client *dynamic.DynamicClient, err error) {
-	config, err := getConfig()
+	config, err = clientcmd.BuildConfigFromFlags("", kubeconfig)
 	if err != nil {
 		return nil, err
 	}