Merge pull request #280 from covexo/config-fix

Implement token handling for kubeconfig

Author: FabianKramm

pkg/devspace/clients/kubectl/client.go

@@ -20,6 +20,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
+	"k8s.io/client-go/tools/clientcmd/api"
 	"k8s.io/client-go/tools/portforward"
 	"k8s.io/client-go/tools/remotecommand"
 	"k8s.io/client-go/transport/spdy"
@@ -78,14 +79,39 @@ func GetClientConfig() (*rest.Config, error) {
 		return clientcmd.BuildConfigFromFlags("", clientcmd.RecommendedHomeFile)
 	}
 
-	return &rest.Config{
-		Host: *config.Cluster.APIServer,
-		TLSClientConfig: rest.TLSClientConfig{
-			CAData:   []byte(*config.Cluster.CaCert),
-			CertData: []byte(*config.Cluster.User.ClientCert),
-			KeyData:  []byte(*config.Cluster.User.ClientKey),
-		},
-	}, nil
+	// We create a new config object here
+	kubeAuthInfo := api.NewAuthInfo()
+	if config.Cluster.User != nil {
+		if config.Cluster.User.ClientCert != nil {
+			kubeAuthInfo.ClientCertificateData = []byte(*config.Cluster.User.ClientCert)
+		}
+		if config.Cluster.User.ClientKey != nil {
+			kubeAuthInfo.ClientKeyData = []byte(*config.Cluster.User.ClientKey)
+		}
+		if config.Cluster.User.Token != nil {
+			kubeAuthInfo.Token = *config.Cluster.User.Token
+		}
+	}
+
+	kubeCluster := api.NewCluster()
+	if config.Cluster.APIServer != nil {
+		kubeCluster.Server = *config.Cluster.APIServer
+	}
+	if config.Cluster.CaCert != nil {
+		kubeCluster.CertificateAuthorityData = []byte(*config.Cluster.CaCert)
+	}
+
+	kubeContext := api.NewContext()
+	kubeContext.Cluster = "devspace"
+	kubeContext.AuthInfo = "devspace"
+
+	kubeConfig := api.NewConfig()
+	kubeConfig.AuthInfos["devspace"] = kubeAuthInfo
+	kubeConfig.Clusters["devspace"] = kubeCluster
+	kubeConfig.Contexts["devspace"] = kubeContext
+	kubeConfig.CurrentContext = "devspace"
+
+	return clientcmd.NewNonInteractiveClientConfig(*kubeConfig, "devspace", &clientcmd.ConfigOverrides{}, clientcmd.NewDefaultClientConfigLoadingRules()).ClientConfig()
 }
 
 // IsMinikube returns true if the Kubernetes cluster is a minikube

pkg/devspace/cloud/login.go

@@ -141,7 +141,7 @@ func Update(providerConfig ProviderConfig, dsConfig *v1.Config, switchKubeContex
 			kubeContext = provider.KubeContext
 		}
 
-		err = UpdateKubeConfig(kubeContext, cluster, authInfo, switchKubeContext)
+		err = UpdateKubeConfig(kubeContext, namespace, cluster, authInfo, switchKubeContext)
 		if err != nil {
 			return err
 		}
@@ -154,14 +154,15 @@ func Update(providerConfig ProviderConfig, dsConfig *v1.Config, switchKubeContex
 		dsConfig.Cluster.User = &v1.ClusterUser{
 			ClientCert: configutil.String(string(authInfo.ClientCertificateData)),
 			ClientKey:  configutil.String(string(authInfo.ClientKeyData)),
+			Token:      configutil.String(string(authInfo.Token)),
 		}
 	}
 
 	return err
 }
 
 // UpdateKubeConfig adds the devspace-cloud context if necessary and switches the current context
-func UpdateKubeConfig(contextName string, cluster *api.Cluster, authInfo *api.AuthInfo, switchContext bool) error {
+func UpdateKubeConfig(contextName, namespace string, cluster *api.Cluster, authInfo *api.AuthInfo, switchContext bool) error {
 	config, err := kubeconfig.ReadKubeConfig(clientcmd.RecommendedHomeFile)
 	if err != nil {
 		return err
@@ -172,14 +173,18 @@ func UpdateKubeConfig(contextName string, cluster *api.Cluster, authInfo *api.Au
 		config.CurrentContext = contextName
 	}
 
+	// We generate a unique auth info name for each devspace
+	authInfoName := contextName + "-" + namespace
+
 	config.Clusters[contextName] = cluster
-	config.AuthInfos[contextName] = authInfo
+	config.AuthInfos[authInfoName] = authInfo
 
 	// Check if we need to add the context
 	if _, ok := config.Contexts[contextName]; !ok {
 		context := api.NewContext()
 		context.Cluster = contextName
-		context.AuthInfo = contextName
+		context.AuthInfo = authInfoName
+		context.Namespace = namespace
 
 		config.Contexts[contextName] = context
 	}

pkg/devspace/config/v1/cluster.go

@@ -14,4 +14,5 @@ type Cluster struct {
 type ClusterUser struct {
 	ClientCert *string `yaml:"clientCert,omitempty"`
 	ClientKey  *string `yaml:"clientKey,omitempty"`
+	Token      *string `yaml:"token,omitempty"`
 }