Merge pull request #11 from jlandowner/support-context

Support context
jlandowner · Apr 27, 2021 · 5405c75 · 5405c75
2 parents 6d73a5a + 80f3ee2
commit 5405c75
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/cmd/attach.go b/cmd/attach.go
@@ -51,7 +51,7 @@ var (
 
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			k8sclient, err := client.NewClient(&kubeconfigPath)
+			k8sclient, err := client.NewClient(&kubeconfigPath, &kubecontext)
 			if err != nil {
 				return fmt.Errorf("Failed to load kubeconfig %v: %v", kubeconfigPath, err.Error())
 			}

diff --git a/cmd/clean.go b/cmd/clean.go
@@ -39,7 +39,7 @@ var (
 		PersistentPreRunE: c.PreRunE,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			k8sclient, err := client.NewClient(&kubeconfigPath)
+			k8sclient, err := client.NewClient(&kubeconfigPath, &kubecontext)
 			if err != nil {
 				return fmt.Errorf("Failed to load kubeconfig %v: %v", kubeconfigPath, err.Error())
 			}

diff --git a/cmd/detach.go b/cmd/detach.go
@@ -51,7 +51,7 @@ var (
 
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			k8sclient, err := client.NewClient(&kubeconfigPath)
+			k8sclient, err := client.NewClient(&kubeconfigPath, &kubecontext)
 			if err != nil {
 				return fmt.Errorf("Failed to load kubeconfig %v: %v", kubeconfigPath, err.Error())
 			}

diff --git a/cmd/list.go b/cmd/list.go
@@ -44,7 +44,7 @@ var (
 		PersistentPreRunE: l.PreRunE,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			k8sclient, err := client.NewClient(&kubeconfigPath)
+			k8sclient, err := client.NewClient(&kubeconfigPath, &kubecontext)
 			if err != nil {
 				return fmt.Errorf("Failed to load kubeconfig %v: %v", kubeconfigPath, err.Error())
 			}

diff --git a/cmd/root.go b/cmd/root.go
@@ -24,6 +24,7 @@ import (
 
 var (
 	kubeconfigPath string
+	kubecontext    string
 
 	rootCmd = &cobra.Command{
 		Use:   "psp-util",
@@ -41,7 +42,8 @@ Apache License Version 2.0 Copyright 2020 jlandowner
 )
 
 func init() {
-	rootCmd.PersistentFlags().StringVar(&kubeconfigPath, "kubeconfig", "", "kube config file (default is $HOME/.kube/config)")
+	rootCmd.PersistentFlags().StringVar(&kubeconfigPath, "kubeconfig", "", "kubeconfig file path (default: $HOME/.kube/config)")
+	rootCmd.PersistentFlags().StringVar(&kubecontext, "context", "", "kube-context (default: current context)")
 }
 
 func Execute() {

diff --git a/cmd/tree.go b/cmd/tree.go
@@ -36,7 +36,7 @@ var treeCmd = &cobra.Command{
 	Short: "View a relational tree between PSP and Subjects in cluster",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		ctx := context.Background()
-		k8sclient, err := client.NewClient(&kubeconfigPath)
+		k8sclient, err := client.NewClient(&kubeconfigPath, &kubecontext)
 		if err != nil {
 			return fmt.Errorf("Failed to load kubeconfig %v: %v", kubeconfigPath, err.Error())
 		}

diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -26,15 +26,19 @@ import (
 )
 
 // NewClient returns kubernetes Clientset
-func NewClient(kubeconfigPath *string) (*kubernetes.Clientset, error) {
+func NewClient(kubeconfigPath *string, kubecontext *string) (*kubernetes.Clientset, error) {
 	if *kubeconfigPath == "" {
 		*kubeconfigPath = filepath.Join(homeDir(), ".kube", "config")
 	}
 
-	config, err := clientcmd.BuildConfigFromFlags("", *kubeconfigPath)
+	config, err := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
+		&clientcmd.ClientConfigLoadingRules{ExplicitPath: *kubeconfigPath},
+		&clientcmd.ConfigOverrides{CurrentContext: *kubecontext}).ClientConfig()
+
 	if err != nil {
 		return nil, err
 	}
+
 	return kubernetes.NewForConfig(config)
 }