Merge pull request #2227 from FabianKramm/main

small improvements

Author: FabianKramm

cmd/build.go

@@ -14,6 +14,11 @@ func NewBuildCmd(f factory.Factory, globalFlags *flags.GlobalFlags, rawConfig *R
 		Pipeline:    "build",
 		ForceBuild:  true,
 	}
+
+	var pipeline *latest.Pipeline
+	if rawConfig != nil && rawConfig.Config != nil && rawConfig.Config.Pipelines != nil {
+		pipeline = rawConfig.Config.Pipelines["build"]
+	}
 	buildCmd := &cobra.Command{
 		Use:   "build",
 		Short: "Builds all defined images and pushes them",
@@ -27,11 +32,6 @@ Builds all defined images and pushes them
 			return cmd.Run(cobraCmd, args, f, "buildCommand")
 		},
 	}
-
-	var pipeline *latest.Pipeline
-	if rawConfig != nil && rawConfig.Config != nil && rawConfig.Config.Pipelines != nil {
-		pipeline = rawConfig.Config.Pipelines["build"]
-	}
 	cmd.AddPipelineFlags(f, buildCmd, pipeline)
 	return buildCmd
 }

cmd/deploy.go

@@ -15,6 +15,10 @@ func NewDeployCmd(f factory.Factory, globalFlags *flags.GlobalFlags, rawConfig *
 		Pipeline:                "deploy",
 	}
 
+	var pipeline *latest.Pipeline
+	if rawConfig != nil && rawConfig.Config != nil && rawConfig.Config.Pipelines != nil {
+		pipeline = rawConfig.Config.Pipelines["deploy"]
+	}
 	deployCmd := &cobra.Command{
 		Use:   "deploy",
 		Short: "Deploys the project",
@@ -32,11 +36,6 @@ devspace deploy --kube-context=deploy-context
 			return cmd.Run(cobraCmd, args, f, "deployCommand")
 		},
 	}
-
-	var pipeline *latest.Pipeline
-	if rawConfig != nil && rawConfig.Config != nil && rawConfig.Config.Pipelines != nil {
-		pipeline = rawConfig.Config.Pipelines["deploy"]
-	}
 	cmd.AddPipelineFlags(f, deployCmd, pipeline)
 	return deployCmd
 }

cmd/dev.go

@@ -14,6 +14,11 @@ func NewDevCmd(f factory.Factory, globalFlags *flags.GlobalFlags, rawConfig *Raw
 		SkipPushLocalKubernetes: true,
 		Pipeline:                "dev",
 	}
+
+	var pipeline *latest.Pipeline
+	if rawConfig != nil && rawConfig.Config != nil && rawConfig.Config.Pipelines != nil {
+		pipeline = rawConfig.Config.Pipelines["dev"]
+	}
 	devCmd := &cobra.Command{
 		Use:   "dev",
 		Short: "Starts the development mode",
@@ -27,11 +32,6 @@ Starts your project in development mode
 			return cmd.Run(cobraCmd, args, f, "devCommand")
 		},
 	}
-
-	var pipeline *latest.Pipeline
-	if rawConfig != nil && rawConfig.Config != nil && rawConfig.Config.Pipelines != nil {
-		pipeline = rawConfig.Config.Pipelines["dev"]
-	}
 	cmd.AddPipelineFlags(f, devCmd, pipeline)
 	return devCmd
 }

cmd/purge.go

@@ -15,6 +15,11 @@ func NewPurgeCmd(f factory.Factory, globalFlags *flags.GlobalFlags, rawConfig *R
 		Pipeline:                "purge",
 		SkipPushLocalKubernetes: true,
 	}
+
+	var pipeline *latest.Pipeline
+	if rawConfig != nil && rawConfig.Config != nil && rawConfig.Config.Pipelines != nil {
+		pipeline = rawConfig.Config.Pipelines["purge"]
+	}
 	purgeCmd := &cobra.Command{
 		Use:   "purge",
 		Short: "Deletes deployed resources",
@@ -30,11 +35,6 @@ devspace purge
 			return cmd.Run(cobraCmd, args, f, "purgeCommand")
 		},
 	}
-
-	var pipeline *latest.Pipeline
-	if rawConfig != nil && rawConfig.Config != nil && rawConfig.Config.Pipelines != nil {
-		pipeline = rawConfig.Config.Pipelines["purge"]
-	}
 	cmd.AddPipelineFlags(f, purgeCmd, pipeline)
 	return purgeCmd
 }

cmd/render.go

@@ -19,6 +19,10 @@ func NewRenderCmd(f factory.Factory, globalFlags *flags.GlobalFlags, rawConfig *
 		RenderWriter:            os.Stdout,
 	}
 
+	var pipeline *latest.Pipeline
+	if rawConfig != nil && rawConfig.Config != nil && rawConfig.Config.Pipelines != nil {
+		pipeline = rawConfig.Config.Pipelines["deploy"]
+	}
 	renderCmd := &cobra.Command{
 		Use:   "render",
 		Short: "Builds all defined images and shows the yamls that would be deployed",
@@ -35,11 +39,6 @@ deployment.
 			return cmd.Run(cobraCmd, args, f, "renderCommand")
 		},
 	}
-
-	var pipeline *latest.Pipeline
-	if rawConfig != nil && rawConfig.Config != nil && rawConfig.Config.Pipelines != nil {
-		pipeline = rawConfig.Config.Pipelines["deploy"]
-	}
 	cmd.AddPipelineFlags(f, renderCmd, pipeline)
 	return renderCmd
 }

cmd/run_pipeline.go

@@ -426,6 +426,12 @@ func runPipeline(ctx devspacecontext.Context, args []string, options *CommandOpt
 	var configPipeline *latest.Pipeline
 	if ctx.Config().Config().Pipelines != nil && ctx.Config().Config().Pipelines[options.Pipeline] != nil {
 		configPipeline = ctx.Config().Config().Pipelines[options.Pipeline]
+		if configPipeline.Run == "" {
+			defaultPipeline, _ := types.GetDefaultPipeline(options.Pipeline)
+			if defaultPipeline != nil {
+				configPipeline.Run = defaultPipeline.Run
+			}
+		}
 	} else {
 		var err error
 		configPipeline, err = types.GetDefaultPipeline(options.Pipeline)

pkg/devspace/build/builder/helper/helper.go

@@ -4,6 +4,7 @@ import (
 	"github.com/docker/cli/cli/command/image/build"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/archive"
+	"github.com/loft-sh/devspace/pkg/devspace/config/localcache"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
 	dockerclient "github.com/loft-sh/devspace/pkg/devspace/docker"
@@ -146,6 +147,10 @@ func (b *BuildHelper) ShouldRebuild(ctx devspacecontext.Context, forceRebuild bo
 	if !mustRebuild && ctx.KubeClient() != nil && ctx.Config().LocalCache().GetLastContext() != nil && ctx.Config().LocalCache().GetLastContext().Context != ctx.KubeClient().CurrentContext() && kubectl.IsLocalKubernetes(ctx.Config().LocalCache().GetLastContext().Context) {
 		mustRebuild = true
 		ctx.Log().Infof("Rebuild image %s because previous build was local kubernetes", imageCache.ImageName)
+		ctx.Config().LocalCache().SetLastContext(&localcache.LastContextConfig{
+			Namespace: ctx.KubeClient().Namespace(),
+			Context:   ctx.KubeClient().CurrentContext(),
+		})
 	}
 
 	// Check if should consider context path changes for rebuilding

pkg/devspace/config/loader/variable/resolver.go

@@ -244,7 +244,7 @@ func (r *resolver) FillVariablesInclude(ctx context.Context, haystack interface{
 	for _, path := range includedPaths {
 		path = strings.ReplaceAll(path, "*", "[^/]+")
 		path = strings.ReplaceAll(path, "**", ".+")
-		path = "^" + path
+		path = "^" + path + "$"
 		expr, err := regexp.Compile(path)
 		if err != nil {
 			return nil, err
@@ -274,7 +274,7 @@ func (r *resolver) FillVariablesExclude(ctx context.Context, haystack interface{
 	for _, path := range excludedPaths {
 		path = strings.ReplaceAll(path, "*", "[^/]+")
 		path = strings.ReplaceAll(path, "**", ".+")
-		path = "^" + path
+		path = "^" + path + "$"
 		expr, err := regexp.Compile(path)
 		if err != nil {
 			return nil, err

pkg/devspace/config/loader/variable/runtime/runtime_variable.go

@@ -14,8 +14,8 @@ import (
 var Locations = []string{
 	"/images/*/build/custom/command",
 	"/images/*/build/custom/commands/*/command",
-	"/images/*/build/custom/args/*",
-	"/images/*/build/custom/appendArgs/*",
+	"/images/*/build/custom/args/**",
+	"/images/*/build/custom/appendArgs/**",
 	"/deployments/*/helm/values/**",
 	"/hooks/*/command",
 	"/hooks/*/args/*",
@@ -29,7 +29,8 @@ var Locations = []string{
 	"/dev/replacePods/*/imageSelector",
 	"/dev/replacePods/*/replaceImage",
 	"/dev/terminal/imageSelector",
-	"/pipelines/**",
+	"/pipelines/*",
+	"/pipelines/*/run",
 	"/commands/*",
 	"/commands/*/command",
 	"/functions/**",

pkg/devspace/config/versions/latest/schema.go

@@ -1234,7 +1234,7 @@ type Terminal struct {
 // DependencyConfig defines the devspace dependency
 type DependencyConfig struct {
 	// Name is used internally
-	Name string `yaml:"name" json:"name" jsonschema_description:"Name is used internally."`
+	Name string `yaml:"name,omitempty" json:"name,omitempty" jsonschema_description:"Name is used internally."`
 
 	// Source holds the dependency project
 	Source *SourceConfig `yaml:",inline" json:",inline" jsonschema_description:"Source holds the dependency project."`