Merge pull request #11 from lpabon/kubecontext

Context for kubernetes
portworx · Jul 17, 2019 · aba31b7 · aba31b7
2 parents bcc2420 + b80e180
commit aba31b7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/cmd/getPvc.go b/cmd/getPvc.go
@@ -54,7 +54,7 @@ func getPvcExec(cmd *cobra.Command, args []string) error {
 	defer conn.Close()
 
 	// Connect to kubernetes
-	cc, kc, err := kubernetes.KubeConnect(GetConfigFile())
+	cc, kc, err := KubeConnectDefault()
 	if err != nil {
 		return err
 	}

diff --git a/cmd/getVolumes.go b/cmd/getVolumes.go
@@ -20,7 +20,6 @@ import (
 	"strings"
 
 	api "github.com/libopenstorage/openstorage-sdk-clients/sdk/golang"
-	"github.com/portworx/px/pkg/kubernetes"
 	"github.com/portworx/px/pkg/util"
 
 	"google.golang.org/grpc"
@@ -62,7 +61,7 @@ func getVolumesExec(cmd *cobra.Command, args []string) error {
 	var pods []v1.Pod
 	showK8s, _ := cmd.Flags().GetBool("show-k8s-info")
 	if showK8s {
-		_, kc, err := kubernetes.KubeConnect(GetConfigFile())
+		_, kc, err := KubeConnectDefault()
 		if err != nil {
 			return err
 		}

diff --git a/cmd/root.go b/cmd/root.go
@@ -20,12 +20,16 @@ import (
 	"os"
 	"path"
 
-	homedir "github.com/mitchellh/go-homedir"
+	"github.com/portworx/px/pkg/kubernetes"
 	"github.com/portworx/px/pkg/plugin"
 	"github.com/portworx/px/pkg/portworx"
 	"github.com/portworx/px/pkg/util"
+
+	homedir "github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
+	kclikube "k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/tools/clientcmd"
 )
 
 const (
@@ -121,3 +125,7 @@ func PxConnectDefault() (context.Context, *grpc.ClientConn, error) {
 		return portworx.PxConnectNamed(cfgFile, cfgContext)
 	}
 }
+
+func KubeConnectDefault() (clientcmd.ClientConfig, *kclikube.Clientset, error) {
+	return kubernetes.KubeConnect(cfgFile, cfgContext)
+}
diff --git a/pkg/kubernetes/connect.go b/pkg/kubernetes/connect.go
@@ -30,9 +30,18 @@ import (
 // set in the default context.
 // clientcmd.ClientConfig will allow the caller to call ClientConfig.Namespace() to get the namespace
 // set by the caller on their Kubeconfig.
-func KubeConnect(cfgFile string) (clientcmd.ClientConfig, *kubernetes.Clientset, error) {
-	var kubeconfig string
-	pxctx, err := contextconfig.NewConfigReference(cfgFile).GetCurrent()
+func KubeConnect(cfgFile, context string) (clientcmd.ClientConfig, *kubernetes.Clientset, error) {
+	var (
+		kubeconfig string
+		pxctx      *contextconfig.ClientContext
+		err        error
+	)
+
+	if len(context) == 0 {
+		pxctx, err = contextconfig.NewConfigReference(cfgFile).GetCurrent()
+	} else {
+		pxctx, err = contextconfig.NewConfigReference(cfgFile).GetNamedContext(context)
+	}
 	if err != nil {
 		return nil, nil, err
 	}