Merge pull request #419 from covexo/tiller-issue

Fix issue with wrong tiller deployment on devspace up
devspace-sh · Dec 10, 2018 · 970577e · 970577e
2 parents c61a80f + b6240b1
commit 970577e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/cmd/init.go b/cmd/init.go
@@ -317,6 +317,10 @@ func (cmd *InitCmd) configureDevSpace() {
 	config := configutil.GetConfig()
 	config.Cluster.KubeContext = &currentContext
 	config.Cluster.Namespace = namespace
+
+	config.Tiller = &v1.TillerConfig{
+		Namespace: namespace,
+	}
 }
 
 func (cmd *InitCmd) addDefaultService() {

diff --git a/pkg/devspace/helm/tiller.go b/pkg/devspace/helm/tiller.go
@@ -86,7 +86,13 @@ func createTiller(kubectlClient *kubernetes.Clientset, dsConfig *v1.Config, till
 	}
 
 	// Create the deployment
-	return helminstaller.Install(kubectlClient, tillerOptions)
+	err = helminstaller.Install(kubectlClient, tillerOptions)
+	if err != nil {
+		return err
+	}
+
+	log.Donef("Created deployment %s in %s", TillerDeploymentName, tillerOptions.Namespace)
+	return nil
 }
 
 func waitUntilTillerIsStarted(kubectlClient *kubernetes.Clientset) error {