Merge pull request #317 from covexo/issue-307

Move update devspace config

Author: FabianKramm

pkg/devspace/cloud/config.go

@@ -5,7 +5,6 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/covexo/devspace/pkg/devspace/config/v1"
 	homedir "github.com/mitchellh/go-homedir"
 	yaml "gopkg.in/yaml.v2"
 )
@@ -112,16 +111,3 @@ func SaveCloudConfig(config ProviderConfig) error {
 
 	return ioutil.WriteFile(cfgPath, out, 0600)
 }
-
-// UpdateDevSpaceConfig updates the devspace config with the newest namespace
-func UpdateDevSpaceConfig(dsConfig *v1.Config, namespace string) {
-	// Update tiller if needed
-	if dsConfig.Tiller != nil {
-		dsConfig.Tiller.Namespace = &namespace
-	}
-
-	// Update registry namespace if needed
-	if dsConfig.InternalRegistry != nil {
-		dsConfig.InternalRegistry.Namespace = &namespace
-	}
-}

pkg/devspace/cloud/login.go

@@ -130,7 +130,15 @@ func Update(providerConfig ProviderConfig, dsConfig *v1.Config, useKubeContext,
 		return err
 	}
 
-	UpdateDevSpaceConfig(dsConfig, namespace)
+	// Update tiller if needed
+	if dsConfig.Tiller != nil {
+		dsConfig.Tiller.Namespace = &namespace
+	}
+
+	// Update registry namespace if needed
+	if dsConfig.InternalRegistry != nil {
+		dsConfig.InternalRegistry.Namespace = &namespace
+	}
 
 	if useKubeContext {
 		kubeContext := DevSpaceKubeContextName + "-" + namespace