Merge branch 'master' into v6-docs

Author: LukasGentele

cmd/add/add.go

@@ -11,7 +11,7 @@ import (
 func NewAddCmd(f factory.Factory, globalFlags *flags.GlobalFlags, plugins []plugin.Metadata) *cobra.Command {
 	addCmd := &cobra.Command{
 		Use:   "add",
-		Short: "Convenience command: adds something to devspace.yaml",
+		Short: "Adds something to devspace.yaml",
 		Long: `
 #######################################################
 #################### devspace add #####################

cmd/add/plugin.go

@@ -14,7 +14,7 @@ func newPluginCmd(f factory.Factory) *cobra.Command {
 	cmd := &pluginCmd{}
 	pluginCmd := &cobra.Command{
 		Use:   "plugin",
-		Short: "Add a plugin to devspace",
+		Short: "Adds a plugin to devspace",
 		Long: `
 #######################################################
 ############### devspace add plugin ###################

cmd/completion.go

@@ -43,7 +43,7 @@ func NewCompletionCmd() *cobra.Command {
 			return cobra.OnlyValidArgs(cmd, args)
 		},
 		ValidArgs: []string{"bash", "zsh"},
-		Short:     "Output shell completion for the given shell (bash or zsh)",
+		Short:     "Outputs shell completion for the given shell (bash or zsh)",
 		Long:      longDescription,
 		RunE:      completion,
 	}

cmd/deploy.go

@@ -17,7 +17,7 @@ func NewDeployCmd(f factory.Factory, globalFlags *flags.GlobalFlags, rawConfig *
 
 	deployCmd := &cobra.Command{
 		Use:   "deploy",
-		Short: "Deploy the project",
+		Short: "Deploys the project",
 		Long: `
 #######################################################
 ################## devspace deploy ####################

cmd/init.go

@@ -49,9 +49,6 @@ const devspaceFolderGitignore = "\n\n# Ignore DevSpace cache and log folder\n.de
 
 const (
 	// Dockerfile not found options
-	UseExistingDockerfileOption       = "Use the Dockerfile in ./Dockerfile"
-	CreateDockerfileOption            = "Create a Dockerfile for this project"
-	EnterDockerfileOption             = "Enter path to a different Dockerfile"
 	DeployOptionHelm                  = "helm"
 	DeployOptionKubectl               = "kubectl"
 	DeployOptionKustomize             = "kustomize"
@@ -162,9 +159,8 @@ func (cmd *InitCmd) Run(f factory.Factory) error {
 	} else {
 		err = cmd.initDevspace(f, configLoader)
 	}
-
 	if err != nil {
-		panic(err)
+		return err
 	}
 
 	cmd.log.WriteString(logrus.InfoLevel, "\n")
@@ -437,7 +433,7 @@ func (cmd *InitCmd) initDevspace(f factory.Factory, configLoader loader.ConfigLo
 
 		config.Commands["migrate-db"] = &latest.CommandConfig{
 			Command: `echo 'This is a cross-platform, shared command that can be used to codify any kind of dev task.'
-	echo 'Anyone using this project can invoke it via "devspace run migrate-db"'`,
+echo 'Anyone using this project can invoke it via "devspace run migrate-db"'`,
 		}
 	}
 
@@ -456,8 +452,7 @@ start_dev ` + imageName + `                     # 3. Start dev mode "` + imageNa
 	config.Pipelines["deploy"] = &latest.Pipeline{
 		Run: `run_dependency_pipelines --all                    # 1. Deploy any projects this project needs (see "dependencies")
 build_images --all -t $(git describe --always)    # 2. Build, tag (git commit hash) and push all images (see "images")
-create_deployments --all \                        # 3. Deploy Helm charts and manifests specfied as "deployments"
-  --set updateImageTags=true                      #    + make sure to update all image tags to the one from step 2`,
+create_deployments --all                          # 3. Deploy Helm charts and manifests specfied as "deployments"`,
 	}
 
 	// Save config
@@ -739,7 +734,8 @@ func (cmd *InitCmd) render(f factory.Factory, config *latest.Config) (string, er
 	}
 	err = renderCmd.RunDefault(f)
 	if err != nil {
-		return "", err
+		f.GetLog().Debugf("error rendering chart: %v", err)
+		return "", nil
 	}
 
 	return writer.String(), nil

cmd/list/deployments.go

@@ -32,7 +32,7 @@ func newDeploymentsCmd(f factory.Factory, globalFlags *flags.GlobalFlags) *cobra
 #######################################################
 ############# devspace list deployments ###############
 #######################################################
-Shows the status of all deployments
+Lists the status of all deployments
 #######################################################
 	`,
 		Args: cobra.NoArgs,

cmd/logs.go

@@ -50,7 +50,7 @@ func NewLogsCmd(f factory.Factory, globalFlags *flags.GlobalFlags) *cobra.Comman
 #######################################################
 #################### devspace logs ####################
 #######################################################
-Logs prints the last log of a pod container and attachs 
+Prints the last log of a pod container and attachs 
 to it
 
 Example:

cmd/print.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/loft-sh/devspace/pkg/devspace/config"
+	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
 	"github.com/loft-sh/devspace/pkg/devspace/dependency"
 	"github.com/loft-sh/devspace/pkg/devspace/dependency/types"
@@ -27,8 +28,9 @@ import (
 type PrintCmd struct {
 	*flags.GlobalFlags
 
-	Out      io.Writer
-	SkipInfo bool
+	Out        io.Writer
+	StripNames bool
+	SkipInfo   bool
 
 	Dependency string
 }
@@ -37,12 +39,13 @@ type PrintCmd struct {
 func NewPrintCmd(f factory.Factory, globalFlags *flags.GlobalFlags) *cobra.Command {
 	cmd := &PrintCmd{
 		GlobalFlags: globalFlags,
+		StripNames:  true,
 		Out:         os.Stdout,
 	}
 
 	printCmd := &cobra.Command{
 		Use:   "print",
-		Short: "Print displays the configuration",
+		Short: "Prints displays the configuration",
 		Long: `
 #######################################################
 ################## devspace print #####################
@@ -117,7 +120,7 @@ func (cmd *PrintCmd) Run(f factory.Factory) error {
 		ctx = ctx.AsDependency(dep)
 	}
 
-	bsConfig, err := yaml.Marshal(ctx.Config().Config())
+	bsConfig, err := marshalConfig(ctx.Config().Config(), cmd.StripNames)
 	if err != nil {
 		return err
 	}
@@ -141,6 +144,41 @@ func (cmd *PrintCmd) Run(f factory.Factory) error {
 	return nil
 }
 
+func marshalConfig(config *latest.Config, stripNames bool) ([]byte, error) {
+	// remove the auto generated names
+	if stripNames {
+		for k := range config.Images {
+			config.Images[k].Name = ""
+		}
+		for k := range config.Deployments {
+			config.Deployments[k].Name = ""
+		}
+		for k := range config.Dependencies {
+			config.Dependencies[k].Name = ""
+		}
+		for k := range config.Pipelines {
+			config.Pipelines[k].Name = ""
+		}
+		for k := range config.Dev {
+			config.Dev[k].Name = ""
+			for c := range config.Dev[k].Containers {
+				config.Dev[k].Containers[c].Container = ""
+			}
+		}
+		for k := range config.Vars {
+			config.Vars[k].Name = ""
+		}
+		for k := range config.PullSecrets {
+			config.PullSecrets[k].Name = ""
+		}
+		for k := range config.Commands {
+			config.Commands[k].Name = ""
+		}
+	}
+
+	return yaml.Marshal(config)
+}
+
 func printExtraInfo(config config.Config, dependencies []types.Dependency, log logger.Logger) error {
 	log.WriteString(logrus.InfoLevel, "\n-------------------\n\nVars:\n")
 

cmd/purge.go

@@ -17,7 +17,7 @@ func NewPurgeCmd(f factory.Factory, globalFlags *flags.GlobalFlags, rawConfig *R
 	}
 	purgeCmd := &cobra.Command{
 		Use:   "purge",
-		Short: "Delete deployed resources",
+		Short: "Deletes deployed resources",
 		Long: `
 #######################################################
 ################### devspace purge ####################

cmd/remove/remove.go

@@ -11,7 +11,7 @@ import (
 func NewRemoveCmd(f factory.Factory, globalFlags *flags.GlobalFlags, plugins []plugin.Metadata) *cobra.Command {
 	removeCmd := &cobra.Command{
 		Use:   "remove",
-		Short: "Changes devspace configuration",
+		Short: "Removes devspace configuration",
 		Long: `
 #######################################################
 ################## devspace remove ####################