fix #233

Author: gentele

Gopkg.lock

@@ -7,14 +7,17 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"path/filepath"
 	"sync"
 
 	"github.com/covexo/devspace/pkg/devspace/config/configutil"
+	"github.com/covexo/devspace/pkg/util/fsutil"
 	"github.com/covexo/devspace/pkg/util/log"
 	dockerterm "github.com/docker/docker/pkg/term"
 	k8sv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
+	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/portforward"
@@ -210,15 +213,19 @@ func GetClientConfig() (*rest.Config, error) {
 		return nil, errors.New("Couldn't load cluster config, did you run devspace init")
 	}
 
-	return &rest.Config{
-		Host:     *config.Cluster.APIServer,
-		Username: *config.Cluster.User.Username,
-		TLSClientConfig: rest.TLSClientConfig{
-			CAData:   []byte(*config.Cluster.CaCert),
-			CertData: []byte(*config.Cluster.User.ClientCert),
-			KeyData:  []byte(*config.Cluster.User.ClientKey),
-		},
-	}, nil
+	if (config.Cluster.UseKubeConfig != nil && *config.Cluster.UseKubeConfig) || config.Cluster.APIServer == nil {
+		return clientcmd.BuildConfigFromFlags("", filepath.Join(fsutil.GetHomeDir(), ".kube", "config"))
+	} else {
+		return &rest.Config{
+			Host:     *config.Cluster.APIServer,
+			Username: *config.Cluster.User.Username,
+			TLSClientConfig: rest.TLSClientConfig{
+				CAData:   []byte(*config.Cluster.CaCert),
+				CertData: []byte(*config.Cluster.User.ClientCert),
+				KeyData:  []byte(*config.Cluster.User.ClientKey),
+			},
+		}, nil
+	}
 }
 
 // ForwardPorts forwards the specified ports from the cluster to the local machine

pkg/devspace/clients/kubectl/client.go

@@ -62,10 +62,6 @@ func GetConfig(reload bool) *v1.Config {
 		merge(config, configRaw, unsafe.Pointer(&config), unsafe.Pointer(configRaw))
 		merge(config, overwriteConfig, unsafe.Pointer(&config), unsafe.Pointer(overwriteConfig))
 	}
-
-	if (config.Cluster.UseKubeConfig != nil && *config.Cluster.UseKubeConfig) || config.Cluster.APIServer == nil {
-		loadClusterConfig(config.Cluster, false)
-	}
 	return config
 }
 

pkg/devspace/config/configutil/get.go

@@ -2,12 +2,9 @@ package configutil
 
 import (
 	"io/ioutil"
-	"path/filepath"
 
 	"github.com/covexo/devspace/pkg/devspace/config/v1"
-	"github.com/covexo/devspace/pkg/util/fsutil"
 	yaml "gopkg.in/yaml.v2"
-	"k8s.io/client-go/tools/clientcmd"
 )
 
 func loadConfig(config *v1.Config, path string) error {
@@ -18,60 +15,3 @@ func loadConfig(config *v1.Config, path string) error {
 	}
 	return yaml.Unmarshal(yamlFileContent, config)
 }
-
-//LoadClusterConfig loads the config for a kubernetes cluster
-func loadClusterConfig(config *v1.Cluster, overwriteExistingValues bool) {
-	kubeconfig, kubeconfigErr := clientcmd.BuildConfigFromFlags("", filepath.Join(fsutil.GetHomeDir(), ".kube", "config"))
-
-	if kubeconfigErr == nil {
-		if config.APIServer == nil {
-			if len(kubeconfig.Host) != 0 {
-				config.APIServer = String(kubeconfig.Host)
-			}
-		}
-
-		if config.CaCert == nil {
-			if len(kubeconfig.TLSClientConfig.CAData) == 0 {
-				caData, caFileErr := fsutil.ReadFile(kubeconfig.TLSClientConfig.CAFile, 0)
-
-				if caFileErr == nil {
-					config.CaCert = String(string(caData))
-				}
-			} else {
-				config.CaCert = String(string(kubeconfig.CAData))
-			}
-		}
-
-		if config.User == nil {
-			config.User = &v1.ClusterUser{}
-		}
-
-		if config.User.Username == nil {
-			config.User.Username = String(kubeconfig.Username)
-		}
-
-		if config.User.ClientCert == nil {
-			if len(kubeconfig.TLSClientConfig.CertData) == 0 {
-				certData, certFileErr := fsutil.ReadFile(kubeconfig.TLSClientConfig.CertFile, 0)
-
-				if certFileErr == nil {
-					config.User.ClientCert = String(string(certData))
-				}
-			} else {
-				config.User.ClientCert = String(string(kubeconfig.TLSClientConfig.CertData))
-			}
-		}
-
-		if config.User.ClientKey == nil {
-			if len(kubeconfig.TLSClientConfig.KeyData) == 0 {
-				keyData, keyFileErr := fsutil.ReadFile(kubeconfig.TLSClientConfig.KeyFile, 0)
-
-				if keyFileErr == nil {
-					config.User.ClientKey = String(string(keyData))
-				}
-			} else {
-				config.User.ClientKey = String(string(kubeconfig.TLSClientConfig.KeyData))
-			}
-		}
-	}
-}