small fixes for gitignore and console output

Author: Lukas Gentele

cmd/init.go

@@ -25,7 +25,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const configGitignore = "\n\n# Exclude .devspace generated files\n.devspace/"
+const configGitignore = "\n\n# Exclude .devspace generated files\n.devspace/\n"
 
 const (
 	// Cluster options
@@ -88,7 +88,8 @@ func (cmd *InitCmd) Run(cobraCmd *cobra.Command, args []string) {
 	// Check if config already exists
 	configExists := configutil.ConfigExists()
 	if configExists && cmd.Reconfigure == false {
-		log.Info("Config devspace.yaml already exists. If you want to recreate the config please run `devspace init --reconfigure`")
+		log.Info("Config already exists. If you want to recreate the config please run `devspace init --reconfigure`")
+		log.Infof("If you want to continue with the existing config, run:\n- `%s` to develop application\n- `%s` to deploy application", ansi.Color("devspace dev", "white+b"), ansi.Color("devspace deploy", "white+b"))
 		os.Exit(0)
 	}
 
@@ -230,14 +231,23 @@ func (cmd *InitCmd) Run(cobraCmd *cobra.Command, args []string) {
 	if os.IsNotExist(err) {
 		fsutil.WriteToFile([]byte(configGitignore), ".gitignore")
 	} else {
-		gitignore, err := os.OpenFile(".gitignore", os.O_APPEND|os.O_WRONLY, 0600)
+		gitignoreContent, err := ioutil.ReadFile(".gitignore")
 		if err != nil {
-			log.Warnf("Error writing to .gitignore: %v", err)
+			log.Warnf("Error reading .gitignore: %v", err)
 		} else {
-			defer gitignore.Close()
+			gitignoreRegexp := regexp.MustCompile("(?ms)(^|[^!]).devspace/(\\n|$)")
 
-			if _, err = gitignore.WriteString(configGitignore); err != nil {
-				log.Warnf("Error writing to .gitignore: %v", err)
+			if gitignoreRegexp.MatchString(string(gitignoreContent)) == false {
+				gitignore, err := os.OpenFile(".gitignore", os.O_APPEND|os.O_WRONLY, 0600)
+				if err != nil {
+					log.Warnf("Error writing to .gitignore: %v", err)
+				} else {
+					defer gitignore.Close()
+
+					if _, err = gitignore.WriteString(configGitignore); err != nil {
+						log.Warnf("Error writing to .gitignore: %v", err)
+					}
+				}
 			}
 		}
 	}

pkg/devspace/cloud/cluster.go

@@ -75,7 +75,7 @@ func (p *Provider) ConnectCluster(options *ConnectClusterOptions) error {
 	// Check what kube context to use
 	if options.KubeContext == "" {
 		// Get kube context to use
-		config, err = kubectl.GetClientConfigBySelect(false)
+		config, err = kubectl.GetClientConfigBySelect(false, true)
 		if err != nil {
 			return errors.Wrap(err, "new kubectl client")
 		}
@@ -533,7 +533,7 @@ func (p *Provider) ResetKey(clusterName string) error {
 	}
 
 	// Get kube context to use
-	config, err := kubectl.GetClientConfigBySelect(false)
+	config, err := kubectl.GetClientConfigBySelect(false, false)
 	if err != nil {
 		return errors.Wrap(err, "new kubectl client")
 	}

pkg/devspace/configure/image.go

@@ -84,35 +84,13 @@ func GetImageConfigFromDockerfile(config *latest.Config, dockerfile, context str
 	}
 
 	// Check if docker is installed
-	for {
-		_, err = client.Ping(contextpkg.Background())
-		if err != nil {
-			// Check if docker cli is installed
-			runErr := exec.Command("docker").Run()
-			if runErr == nil {
-				useKaniko = survey.Question(&survey.QuestionOptions{
-					Question:     "Docker seems to be installed but is not running: " + err.Error() + " \nShould we build with kaniko instead?",
-					DefaultValue: "no",
-					Options:      []string{"yes", "no"},
-				}) == "yes"
-
-				if useKaniko == false {
-					continue
-				}
-			}
-
-			// We use kaniko
-			useKaniko = true
-
-			// Set default build engine to kaniko, if no docker is installed
-			retImageConfig.Build = &latest.BuildConfig{
-				Kaniko: &latest.KanikoConfig{
-					Cache: ptr.Bool(true),
-				},
-			}
+	_, err = client.Ping(contextpkg.Background())
+	if err != nil {
+		// Check if docker cli is installed
+		runErr := exec.Command("docker").Run()
+		if runErr == nil {
+			log.Warn("Docker daemon not running. Start Docker daemon to build images with Docker instead of using the kaniko fallback.")
 		}
-
-		break
 	}
 
 	// If not kaniko get docker hub credentials

pkg/devspace/kubectl/client.go

@@ -63,7 +63,7 @@ func GetClientConfigFromKubectl() (*rest.Config, error) {
 }
 
 // GetClientConfigBySelect let's the user select a kube context to use
-func GetClientConfigBySelect(allowPrivate bool) (*rest.Config, error) {
+func GetClientConfigBySelect(allowPrivate bool, switchContext bool) (*rest.Config, error) {
 	kubeConfig, err := kubeconfig.ReadKubeConfig(clientcmd.RecommendedHomeFile)
 	if err != nil {
 		return nil, err
@@ -104,6 +104,15 @@ func GetClientConfigBySelect(allowPrivate bool) (*rest.Config, error) {
 			}
 		}
 
+		if switchContext {
+			kubeConfig.CurrentContext = kubeContext
+
+			err = kubeconfig.WriteKubeConfig(kubeConfig, clientcmd.RecommendedHomeFile)
+			if err != nil {
+				return nil, errors.Wrap(err, "write kube config")
+			}
+		}
+
 		return GetClientConfigFromContext(kubeContext)
 	}
 

pkg/util/log/loading_text.go

@@ -51,20 +51,7 @@ func (l *loadingText) getLoadingChar() string {
 	var loadingChar string
 	var max int
 
-	if runtime.GOOS == "windows" {
-		switch l.loadingRune {
-		case 0:
-			loadingChar = "|"
-		case 1:
-			loadingChar = "/"
-		case 2:
-			loadingChar = "-"
-		case 3:
-			loadingChar = "\\"
-		}
-
-		max = 3
-	} else {
+	if runtime.GOOS == "darwin" {
 		switch l.loadingRune {
 		case 0:
 			loadingChar = "⠋"
@@ -89,6 +76,19 @@ func (l *loadingText) getLoadingChar() string {
 		}
 
 		max = 9
+	} else {
+		switch l.loadingRune {
+		case 0:
+			loadingChar = "|"
+		case 1:
+			loadingChar = "/"
+		case 2:
+			loadingChar = "-"
+		case 3:
+			loadingChar = "\\"
+		}
+
+		max = 3
 	}
 
 	l.loadingRune++