fix: handle kubeconfig (#24)

sozercan · Apr 15, 2023 · 685b67d · 685b67d
1 parent 9dadc9f
commit 685b67d
Showing 1 changed file with 26 additions and 11 deletions.
diff --git a/cmd/cli/kubernetes.go b/cmd/cli/kubernetes.go
@@ -3,7 +3,6 @@ package cli
 import (
 	"bytes"
 	"context"
-	"flag"
 	"path/filepath"
 
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -19,20 +18,17 @@ import (
 	"k8s.io/client-go/util/homedir"
 )
 
-const defaultNamespace = "default" // TODO: get from kubeconfig
-
-// TODO: get existing objects and pass to prompt
+const defaultNamespace = "default"
 
 func applyManifest(completion string) error {
-	var kubeconfig *string
-	if home := homedir.HomeDir(); home != "" {
-		kubeconfig = flag.String("kubeconfig", filepath.Join(home, ".kube", "config"), "(optional) absolute path to the kubeconfig file")
+	var kubeConfig string
+	if *kubernetesConfigFlags.KubeConfig == "" {
+		kubeConfig = filepath.Join(homedir.HomeDir(), ".kube", "config")
 	} else {
-		kubeconfig = flag.String("kubeconfig", "", "absolute path to the kubeconfig file")
+		kubeConfig = *kubernetesConfigFlags.KubeConfig
 	}
-	flag.Parse()
 
-	config, err := clientcmd.BuildConfigFromFlags("", *kubeconfig)
+	config, err := clientcmd.BuildConfigFromFlags("", kubeConfig)
 	if err != nil {
 		return err
 	}
@@ -47,6 +43,25 @@ func applyManifest(completion string) error {
 		return err
 	}
 
+	var namespace string
+	if *kubernetesConfigFlags.Namespace == "" {
+		clientConfig, err := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
+			&clientcmd.ClientConfigLoadingRules{ExplicitPath: kubeConfig},
+			&clientcmd.ConfigOverrides{
+				CurrentContext: "",
+			}).RawConfig()
+		if err != nil {
+			return err
+		}
+		if clientConfig.Contexts[clientConfig.CurrentContext].Namespace == "" {
+			namespace = defaultNamespace
+		} else {
+			namespace = clientConfig.Contexts[clientConfig.CurrentContext].Namespace
+		}
+	} else {
+		namespace = *kubernetesConfigFlags.Namespace
+	}
+
 	manifest := []byte(completion)
 	decoder := yamlutil.NewYAMLOrJSONDecoder(bytes.NewReader(manifest), 100)
 	for {
@@ -80,7 +95,7 @@ func applyManifest(completion string) error {
 		var dri dynamic.ResourceInterface
 		if mapping.Scope.Name() == meta.RESTScopeNameNamespace {
 			if unstructuredObj.GetNamespace() == "" {
-				unstructuredObj.SetNamespace(defaultNamespace)
+				unstructuredObj.SetNamespace(namespace)
 			}
 			dri = dd.Resource(mapping.Resource).Namespace(unstructuredObj.GetNamespace())
 		} else {