Update cluster config on every up

Author: FabianKramm

cmd/init.go

@@ -360,37 +360,18 @@ func (cmd *InitCmd) useDevSpaceCloud() bool {
 	}) == "yes"
 
 	if useDevSpaceCloud {
-		namespace, cluster, authInfo, err := login.CheckAuth()
-		if err != nil {
-			log.Fatalf("Error authenticating to devspace cloud: %v", err)
-		}
-
-		cmd.config.DevSpace.Release.Namespace = &namespace
-		cmd.config.Services.Tiller.Release.Namespace = &namespace
-
 		addToContext := *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
 			Question:               "Do you want to add the devspace-cloud to the $HOME/.kube/config file? (yes | no)",
 			DefaultValue:           "yes",
 			ValidationRegexPattern: "^(yes)|(no)$",
 		}) == "yes"
 
-		if addToContext {
-			err = login.UpdateKubeConfig(cluster, authInfo, true)
-			if err != nil {
-				log.Fatalf("Couldn't update kube config: %v", err)
-			}
-
-			cmd.config.Cluster.UseKubeConfig = &addToContext
-			cmd.config.Cluster.KubeContext = configutil.String(login.DevSpaceCloudContextName)
-		} else {
-			cmd.config.Cluster.UseKubeConfig = &addToContext
-			cmd.config.Cluster.APIServer = &cluster.Server
-			cmd.config.Cluster.CaCert = configutil.String(string(cluster.CertificateAuthorityData))
+		cmd.config.Cluster.DevSpaceCloud = &useDevSpaceCloud
+		cmd.config.Cluster.UseKubeConfig = &addToContext
 
-			cmd.config.Cluster.User = &v1.ClusterUser{
-				ClientCert: configutil.String(string(authInfo.ClientCertificateData)),
-				ClientKey:  configutil.String(string(authInfo.ClientKeyData)),
-			}
+		err := login.Update(cmd.config)
+		if err != nil {
+			log.Fatalf("Couldn't authenticate to devspace cloud: %v", err)
 		}
 
 		return true

cmd/up.go

@@ -9,6 +9,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/covexo/devspace/pkg/devspace/login"
+
 	"github.com/covexo/devspace/pkg/util/hash"
 	"github.com/covexo/devspace/pkg/util/stdinutil"
 
@@ -135,6 +137,15 @@ func (cmd *UpCmd) Run(cobraCmd *cobra.Command, args []string) {
 		initCmd.Run(nil, []string{})
 	}
 
+	// Load config
+	config := configutil.GetConfig(false)
+	if config.Cluster.DevSpaceCloud != nil && *config.Cluster.DevSpaceCloud {
+		err = login.Update(config)
+		if err != nil {
+			log.Warnf("Couldn't update devspace cloud cluster information: %v", err)
+		}
+	}
+
 	cmd.kubectl, err = kubectl.NewClient()
 	if err != nil {
 		log.Fatalf("Unable to create new kubectl client: %v", err)
@@ -160,7 +171,6 @@ func (cmd *UpCmd) Run(cobraCmd *cobra.Command, args []string) {
 	mustRedeploy := cmd.buildImages()
 
 	// Check if we find a running release pod
-	config := configutil.GetConfig(false)
 	hash, err := hash.Directory("chart")
 	if err != nil {
 		log.Fatalf("Error hashing chart directory: %v", err)

pkg/devspace/config/v1/cluster.go

@@ -3,6 +3,7 @@ package v1
 //Cluster is a struct that contains data for a Kubernetes-Cluster
 type Cluster struct {
 	UseKubeConfig *bool        `yaml:"useKubeConfig,omitempty"`
+	DevSpaceCloud *bool        `yaml:"devSpaceCloud,omitempty"`
 	KubeContext   *string      `yaml:"kubeContext,omitempty"`
 	APIServer     *string      `yaml:"apiServer,omitempty"`
 	CaCert        *string      `yaml:"caCert,omitempty"`

pkg/devspace/login/login.go

@@ -8,6 +8,8 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/covexo/devspace/pkg/devspace/config/configutil"
+	"github.com/covexo/devspace/pkg/devspace/config/v1"
 	"github.com/covexo/devspace/pkg/util/kubeconfig"
 	"github.com/covexo/devspace/pkg/util/yamlutil"
 
@@ -37,7 +39,7 @@ type DevSpaceCloudConfig struct {
 	Token string `yaml:"token"`
 }
 
-// CheckAuth verifies if the user is logged into the devspace cloud and if not loggs the user in
+// CheckAuth verifies if the user is logged into the devspace cloud and if not logs the user in
 func CheckAuth() (string, *api.Cluster, *api.AuthInfo, error) {
 	homedir, err := homedir.Dir()
 	if err != nil {
@@ -80,6 +82,13 @@ func GetClusterConfig(cfg *DevSpaceCloudConfig) (string, *api.Cluster, *api.Auth
 		return "", nil, nil, err
 	}
 
+	if resp.StatusCode == 401 {
+		return Login()
+	}
+	if resp.StatusCode != 200 {
+		return "", nil, nil, fmt.Errorf("Couldn't retrieve cluster config: %s", body)
+	}
+
 	var objmap map[string]*json.RawMessage
 	err = json.Unmarshal(body, &objmap)
 	if err != nil {
@@ -107,7 +116,7 @@ func GetClusterConfig(cfg *DevSpaceCloudConfig) (string, *api.Cluster, *api.Auth
 	return namespace, cluster, authInfo, nil
 }
 
-// Login loggs the user into the devspace cloud
+// Login logs the user into the devspace cloud
 func Login() (string, *api.Cluster, *api.AuthInfo, error) {
 	tokenChannel := make(chan string)
 	homedir, err := homedir.Dir()
@@ -147,6 +156,41 @@ func Login() (string, *api.Cluster, *api.AuthInfo, error) {
 	return GetClusterConfig(&cfg)
 }
 
+// Update updates the devspace cloud information if necessary
+func Update(config *v1.Config) error {
+	// Don't update anything if we don't use the devspace cloud
+	if *config.Cluster.DevSpaceCloud == false {
+		return nil
+	}
+
+	namespace, cluster, authInfo, err := CheckAuth()
+	if err != nil {
+		return err
+	}
+
+	config.DevSpace.Release.Namespace = &namespace
+	config.Services.Tiller.Release.Namespace = &namespace
+
+	if *config.Cluster.UseKubeConfig {
+		err = UpdateKubeConfig(cluster, authInfo, true)
+		if err != nil {
+			return err
+		}
+
+		config.Cluster.KubeContext = configutil.String(DevSpaceCloudContextName)
+	} else {
+		config.Cluster.APIServer = &cluster.Server
+		config.Cluster.CaCert = configutil.String(string(cluster.CertificateAuthorityData))
+
+		config.Cluster.User = &v1.ClusterUser{
+			ClientCert: configutil.String(string(authInfo.ClientCertificateData)),
+			ClientKey:  configutil.String(string(authInfo.ClientKeyData)),
+		}
+	}
+
+	return err
+}
+
 // UpdateKubeConfig adds the devspace-cloud context if necessary and switches the current context
 func UpdateKubeConfig(cluster *api.Cluster, authInfo *api.AuthInfo, switchContext bool) error {
 	config, err := kubeconfig.ReadKubeConfig(clientcmd.RecommendedHomeFile)