commands/.../test,internal/util: use clientcmd's kubeconfig getter (#717)

* commands/.../test,internal/util: use clientcmd's kubeconfig getter

Author: AlexNPavel

Gopkg.lock

@@ -17,10 +17,10 @@ package cmdtest
 import (
 	"bytes"
 	"fmt"
-	"os"
 	"strings"
 	"time"
 
+	k8sInternal "github.com/operator-framework/operator-sdk/internal/util/k8sutil"
 	"github.com/operator-framework/operator-sdk/pkg/scaffold"
 	"github.com/operator-framework/operator-sdk/pkg/test"
 
@@ -29,7 +29,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/tools/clientcmd"
 )
 
 type testClusterConfig struct {
@@ -48,13 +47,8 @@ func NewTestClusterCmd() *cobra.Command {
 		Short: "Run End-To-End tests using image with embedded test binary",
 		RunE:  testClusterFunc,
 	}
-	defaultKubeConfig := ""
-	homedir, ok := os.LookupEnv("HOME")
-	if ok {
-		defaultKubeConfig = homedir + "/.kube/config"
-	}
-	testCmd.Flags().StringVar(&tcConfig.namespace, "namespace", "default", "Namespace to run tests in")
-	testCmd.Flags().StringVar(&tcConfig.kubeconfig, "kubeconfig", defaultKubeConfig, "Kubeconfig path")
+	testCmd.Flags().StringVar(&tcConfig.namespace, "namespace", "", "Namespace to run tests in")
+	testCmd.Flags().StringVar(&tcConfig.kubeconfig, "kubeconfig", "", "Kubeconfig path")
 	testCmd.Flags().StringVar(&tcConfig.imagePullPolicy, "image-pull-policy", "Always", "Set test pod image pull policy. Allowed values: Always, Never")
 	testCmd.Flags().StringVar(&tcConfig.serviceAccount, "service-account", "default", "Service account to run tests on")
 	testCmd.Flags().IntVar(&tcConfig.pendingTimeout, "pending-timeout", 60, "Timeout in seconds for testing pod to stay in pending state (default 60s)")
@@ -98,10 +92,13 @@ func testClusterFunc(cmd *cobra.Command, args []string) error {
 			}},
 		},
 	}
-	kubeconfig, err := clientcmd.BuildConfigFromFlags("", tcConfig.kubeconfig)
+	kubeconfig, defaultNamespace, err := k8sInternal.GetKubeconfigAndNamespace(tcConfig.kubeconfig)
 	if err != nil {
 		return fmt.Errorf("failed to get kubeconfig: %v", err)
 	}
+	if tcConfig.namespace == "" {
+		tcConfig.namespace = defaultNamespace
+	}
 	kubeclient, err := kubernetes.NewForConfig(kubeconfig)
 	if err != nil {
 		return fmt.Errorf("failed to create kubeclient: %v", err)

commands/operator-sdk/cmd/test/cluster.go

@@ -49,12 +49,7 @@ func NewTestLocalCmd() *cobra.Command {
 		Short: "Run End-To-End tests locally",
 		Run:   testLocalFunc,
 	}
-	defaultKubeConfig := ""
-	homedir, ok := os.LookupEnv("HOME")
-	if ok {
-		defaultKubeConfig = homedir + "/.kube/config"
-	}
-	testCmd.Flags().StringVar(&tlConfig.kubeconfig, "kubeconfig", defaultKubeConfig, "Kubeconfig path")
+	testCmd.Flags().StringVar(&tlConfig.kubeconfig, "kubeconfig", "", "Kubeconfig path")
 	testCmd.Flags().StringVar(&tlConfig.globalManPath, "global-manifest", "", "Path to manifest for Global resources (e.g. CRD manifests)")
 	testCmd.Flags().StringVar(&tlConfig.namespacedManPath, "namespaced-manifest", "", "Path to manifest for per-test, namespaced resources (e.g. RBAC and Operator manifest)")
 	testCmd.Flags().StringVar(&tlConfig.goTestFlags, "go-test-flags", "", "Additional flags to pass to go test")

commands/operator-sdk/cmd/test/local.go

@@ -0,0 +1,53 @@
+// Copyright 2018 The Operator-SDK Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package k8sutil
+
+import (
+	"fmt"
+
+	"k8s.io/client-go/rest"
+	"k8s.io/client-go/tools/clientcmd"
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
+)
+
+// GetKubeconfigAndNamespace returns the *rest.Config and default namespace defined in the
+// kubeconfig at the specified path. If no path is provided, returns the default *rest.Config
+// and namespace
+func GetKubeconfigAndNamespace(configPath string) (*rest.Config, string, error) {
+	var clientConfig clientcmd.ClientConfig
+	var apiConfig *clientcmdapi.Config
+	var err error
+	if configPath != "" {
+		apiConfig, err = clientcmd.LoadFromFile(configPath)
+		if err != nil {
+			return nil, "", fmt.Errorf("failed to load user provided kubeconfig: %v", err)
+		}
+	} else {
+		apiConfig, err = clientcmd.NewDefaultClientConfigLoadingRules().Load()
+		if err != nil {
+			return nil, "", fmt.Errorf("failed to get kubeconfig: %v", err)
+		}
+	}
+	clientConfig = clientcmd.NewDefaultClientConfig(*apiConfig, &clientcmd.ConfigOverrides{})
+	kubeconfig, err := clientConfig.ClientConfig()
+	if err != nil {
+		return nil, "", err
+	}
+	namespace, _, err := clientConfig.Namespace()
+	if err != nil {
+		return nil, "", err
+	}
+	return kubeconfig, namespace, nil
+}

internal/util/k8sutil/k8sutil.go

@@ -22,6 +22,8 @@ import (
 	"sync"
 	"time"
 
+	k8sInternal "github.com/operator-framework/operator-sdk/internal/util/k8sutil"
+
 	extscheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
@@ -31,7 +33,6 @@ import (
 	cgoscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/restmapper"
-	"k8s.io/client-go/tools/clientcmd"
 	dynclient "sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -73,7 +74,7 @@ func setup(kubeconfigPath, namespacedManPath *string) error {
 		kubeconfig, err = rest.InClusterConfig()
 		*singleNamespace = true
 	} else {
-		kubeconfig, err = clientcmd.BuildConfigFromFlags("", *kubeconfigPath)
+		kubeconfig, _, err = k8sInternal.GetKubeconfigAndNamespace(*kubeconfigPath)
 	}
 	if err != nil {
 		return fmt.Errorf("failed to build the kubeconfig: %v", err)