Merge pull request #321 from covexo/issue-315

resolve #315

Author: FabianKramm

cmd/init.go

@@ -218,6 +218,7 @@ func (cmd *InitCmd) initChartGenerator() {
 
 func (cmd *InitCmd) useCloudProvider() bool {
 	config := configutil.GetConfig()
+	overwriteConfig := configutil.GetOverwriteConfig()
 	providerConfig, err := cloud.ParseCloudConfig()
 	if err != nil {
 		log.Fatalf("Error loading cloud config: %v", err)
@@ -256,7 +257,7 @@ func (cmd *InitCmd) useCloudProvider() bool {
 			config.Cluster.CloudProvider = &cloudProviderSelected
 
 			log.StartWait("Logging into cloud provider " + providerConfig[cloudProviderSelected].Host + cloud.LoginEndpoint + "...")
-			err := cloud.Update(providerConfig, config, addToContext, true)
+			err := cloud.Update(providerConfig, *config.Cluster.CloudProvider, overwriteConfig, addToContext, true)
 			log.StopWait()
 			if err != nil {
 				log.Fatalf("Couldn't authenticate to DevSpace Cloud: %v", err)
@@ -281,7 +282,7 @@ func (cmd *InitCmd) useCloudProvider() bool {
 			config.Cluster.CloudProvider = configutil.String(cloud.DevSpaceCloudProviderName)
 
 			log.StartWait("Logging into cloud provider " + providerConfig[cloud.DevSpaceCloudProviderName].Host + cloud.LoginEndpoint + "...")
-			err := cloud.Update(providerConfig, config, addToContext, true)
+			err := cloud.Update(providerConfig, *config.Cluster.CloudProvider, overwriteConfig, addToContext, true)
 			log.StopWait()
 			if err != nil {
 				log.Fatalf("Couldn't authenticate to DevSpace Cloud: %v", err)

pkg/devspace/cloud/login.go

@@ -112,9 +112,7 @@ func Login(provider *Provider) (string, *api.Cluster, *api.AuthInfo, error) {
 }
 
 // Update updates the cloud provider information if necessary
-func Update(providerConfig ProviderConfig, dsConfig *v1.Config, useKubeContext, switchKubeContext bool) error {
-	cloudProvider := *dsConfig.Cluster.CloudProvider
-
+func Update(providerConfig ProviderConfig, cloudProvider string, dsConfig *v1.Config, useKubeContext, switchKubeContext bool) error {
 	// Don't update anything if we don't use a cloud provider
 	if cloudProvider == "" {
 		return nil

pkg/devspace/config/configutil/get.go

@@ -124,14 +124,7 @@ func SetDefaultsOnce() {
 					}
 
 					if deployConfig.Namespace == nil {
-						defaultDeployments := *defaultConfig.DevSpace.Deployments
-						defaultValue := String("")
-
-						defaultDeployments = append(defaultDeployments, &v1.DeploymentConfig{
-							Namespace: defaultValue,
-						})
-						defaultConfig.DevSpace.Deployments = &defaultDeployments
-						deployConfig.Namespace = defaultValue
+						deployConfig.Namespace = String("")
 					}
 
 					if deployConfig.Helm != nil {
@@ -157,9 +150,11 @@ func SetDefaultsOnce() {
 			}
 
 			if needTiller && config.Tiller == nil {
-				config.Tiller = &v1.TillerConfig{
+				defaultConfig.Tiller = &v1.TillerConfig{
 					Namespace: &defaultNamespace,
 				}
+
+				config.Tiller = defaultConfig.Tiller
 			}
 		}
 
@@ -174,6 +169,7 @@ func SetDefaultsOnce() {
 		}
 
 		if config.InternalRegistry != nil {
+			defaultConfig.InternalRegistry.Namespace = &defaultNamespace
 			config.InternalRegistry.Namespace = &defaultNamespace
 		}
 	})

pkg/devspace/kubectl/client.go

@@ -155,7 +155,7 @@ func loadCloudConfig(config *v1.Config, log log.Logger) error {
 	}
 
 	log.StartWait("Login to cloud provider")
-	err = cloud.Update(providerConfig, config, config.Cluster.APIServer == nil, false)
+	err = cloud.Update(providerConfig, *config.Cluster.CloudProvider, config, config.Cluster.APIServer == nil, false)
 	log.StopWait()
 	if err != nil {
 		log.Warnf("Couldn't update cloud provider %s information: %v", *config.Cluster.CloudProvider, err)