Merge pull request #2014 from FabianKramm/master

FabianKramm · web-flow · commit 05a6193ee180 · 2022-03-29T18:54:58.000+02:00
refactor: updateImageTags are now default true
diff --git a/examples/buildkit-in-cluster/devspace.yaml b/examples/buildkit-in-cluster/devspace.yaml
@@ -15,7 +15,6 @@ images:
 # Deploy the built image with helm and the component chart
 deployments:
   my-deployment:
-    updateImageTags: true
     helm:
       values:
         containers:
diff --git a/examples/buildkit/devspace.yaml b/examples/buildkit/devspace.yaml
@@ -14,7 +14,6 @@ images:
 # Deploy the built image with helm and the component chart
 deployments:
   my-deployment:
-    updateImageTags: true
     helm:
       values:
         containers:
diff --git a/examples/custom-builder/devspace.yaml b/examples/custom-builder/devspace.yaml
@@ -18,7 +18,6 @@ images:
 
 deployments:
   my-deployment:
-    updateImageTags: true
     kubectl:
       manifests:
       - kube
diff --git a/examples/hot-reload-container-restart/devspace.yaml b/examples/hot-reload-container-restart/devspace.yaml
@@ -11,7 +11,6 @@ images:
 
 deployments:
   my-deployment:
-    updateImageTags: true
     helm:
       values:
         containers:
diff --git a/examples/kaniko/devspace.yaml b/examples/kaniko/devspace.yaml
@@ -11,7 +11,6 @@ images:
 
 deployments:
   my-deployment:
-    updateImageTags: true
     helm:
       values:
         containers:
diff --git a/examples/microservices/node/devspace.yaml b/examples/microservices/node/devspace.yaml
@@ -11,7 +11,6 @@ images:
 
 deployments:
   node:
-    updateImageTags: true
     kubectl:
       manifests:
         - kube/*
diff --git a/examples/microservices/php/devspace.yaml b/examples/microservices/php/devspace.yaml
@@ -11,7 +11,6 @@ images:
 
 deployments:
   php:
-    updateImageTags: true
     helm:
       chart:
         name: chart
diff --git a/examples/php-mysql-example/devspace.yaml b/examples/php-mysql-example/devspace.yaml
@@ -34,7 +34,6 @@ deployments:
           size: 5Gi
 
   php:
-    updateImageTags: true
     helm:
       values:
         containers:
diff --git a/examples/redeploy-instead-of-hot-reload/devspace.yaml b/examples/redeploy-instead-of-hot-reload/devspace.yaml
@@ -15,7 +15,6 @@ images:
 
 deployments:
   default:
-    updateImageTags: true
     helm:
       values:
         containers:
diff --git a/pkg/devspace/config/loader/variable/command_variable.go b/pkg/devspace/config/loader/variable/command_variable.go
@@ -57,7 +57,7 @@ func execCommand(ctx context.Context, varName string, definition *latest.Variabl
 		err = command.Command(ctx, dir, writer, stdErrWriter, nil, cmd, args...)
 	}
 	if err != nil {
-		errMsg := "fill variable " + varName + ": " + err.Error()
+		errMsg := "fill variable " + varName + " with command '" + cmd + "': " + err.Error()
 		if len(writer.Bytes()) > 0 {
 			errMsg = errMsg + "\n\nstdout: \n" + writer.String()
 		}
diff --git a/pkg/devspace/config/versions/latest/schema.go b/pkg/devspace/config/versions/latest/schema.go
@@ -533,7 +533,7 @@ type DeploymentConfig struct {
 	Namespace string `yaml:"namespace,omitempty" json:"namespace,omitempty"`
 	// UpdateImageTags lets you define if DevSpace should update the tags of the images defined in the
 	// images section with their most recent built tag.
-	UpdateImageTags bool `yaml:"updateImageTags,omitempty" json:"updateImageTags,omitempty"`
+	UpdateImageTags *bool `yaml:"updateImageTags,omitempty" json:"updateImageTags,omitempty"`
 
 	// Helm tells DevSpace to deploy this deployment via helm
 	Helm *HelmConfig `yaml:"helm,omitempty" json:"helm,omitempty"`
diff --git a/pkg/devspace/config/versions/v1beta11/upgrade.go b/pkg/devspace/config/versions/v1beta11/upgrade.go
@@ -473,9 +473,7 @@ func (c *Config) Upgrade(log log.Logger) (config.Config, error) {
 			if len(deployment.Helm.DeleteArgs) > 0 {
 				log.Warnf("deployments[*].helm.deleteArgs is not supported anymore in v6")
 			}
-			if deployment.Helm.ReplaceImageTags == nil || *deployment.Helm.ReplaceImageTags {
-				nextConfig.Deployments[name].UpdateImageTags = true
-			}
+			nextConfig.Deployments[name].UpdateImageTags = deployment.Helm.ReplaceImageTags
 		} else if deployment.Kubectl != nil {
 			nextConfig.Deployments[name].Kubectl = &next.KubectlConfig{
 				Manifests:         deployment.Kubectl.Manifests,
@@ -488,9 +486,7 @@ func (c *Config) Upgrade(log log.Logger) (config.Config, error) {
 			if len(deployment.Kubectl.DeleteArgs) > 0 {
 				log.Warnf("deployments[*].kubectl.deleteArgs is not supported anymore in v6")
 			}
-			if deployment.Kubectl.ReplaceImageTags == nil || *deployment.Kubectl.ReplaceImageTags {
-				nextConfig.Deployments[name].UpdateImageTags = true
-			}
+			nextConfig.Deployments[name].UpdateImageTags = deployment.Kubectl.ReplaceImageTags
 		}
 	}
 
diff --git a/pkg/devspace/deploy/deployer/helm/deploy.go b/pkg/devspace/deploy/deployer/helm/deploy.go
@@ -192,7 +192,7 @@ func (d *DeployConfig) getDeploymentValues(ctx *devspacecontext.Context) (bool,
 			return false, nil, errors.Errorf("Couldn't deploy chart, error reading from chart values %s: %v", chartValuesPath, err)
 		}
 
-		if d.DeploymentConfig.UpdateImageTags {
+		if d.DeploymentConfig.UpdateImageTags == nil || *d.DeploymentConfig.UpdateImageTags {
 			redeploy, err := legacy.ReplaceImageNames(overwriteValues, ctx.Config, ctx.Dependencies, nil)
 			if err != nil {
 				return false, nil, err
@@ -213,7 +213,7 @@ func (d *DeployConfig) getDeploymentValues(ctx *devspacecontext.Context) (bool,
 			}
 
 			// Replace image names
-			if d.DeploymentConfig.UpdateImageTags {
+			if d.DeploymentConfig.UpdateImageTags == nil || *d.DeploymentConfig.UpdateImageTags {
 				redeploy, err := legacy.ReplaceImageNames(overwriteValuesFromPath, ctx.Config, ctx.Dependencies, nil)
 				if err != nil {
 					return false, nil, err
@@ -228,7 +228,7 @@ func (d *DeployConfig) getDeploymentValues(ctx *devspacecontext.Context) (bool,
 	// Load override values from data and merge them
 	if d.DeploymentConfig.Helm.Values != nil {
 		enableLegacy := false
-		if d.DeploymentConfig.UpdateImageTags {
+		if d.DeploymentConfig.UpdateImageTags == nil || *d.DeploymentConfig.UpdateImageTags {
 			enableLegacy = true
 		}
 		redeploy, _, err := runtimevar.NewRuntimeResolver(ctx.WorkingDir, enableLegacy).FillRuntimeVariablesWithRebuild(ctx.Context, d.DeploymentConfig.Helm.Values, ctx.Config, ctx.Dependencies)
diff --git a/pkg/devspace/deploy/deployer/kubectl/kubectl.go b/pkg/devspace/deploy/deployer/kubectl/kubectl.go
@@ -221,7 +221,7 @@ func (d *DeployConfig) getReplacedManifest(ctx *devspacecontext.Context, manifes
 			Namespace:  resource.GetNamespace(),
 		})
 
-		if d.DeploymentConfig.UpdateImageTags {
+		if d.DeploymentConfig.UpdateImageTags == nil || *d.DeploymentConfig.UpdateImageTags {
 			redeploy, err := legacy.ReplaceImageNamesStringMap(resource.Object, ctx.Config, ctx.Dependencies, map[string]bool{"image": true})
 			if err != nil {
 				return false, "", nil, err

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func execCommand(ctx context.Context, varName string, definition *latest.Variabl`
`57`	`57`	`err = command.Command(ctx, dir, writer, stdErrWriter, nil, cmd, args...)`
`58`	`58`	`}`
`59`	`59`	`if err != nil {`
`60`		`- errMsg := "fill variable " + varName + ": " + err.Error()`
	`60`	`+ errMsg := "fill variable " + varName + " with command '" + cmd + "': " + err.Error()`
`61`	`61`	`if len(writer.Bytes()) > 0 {`
`62`	`62`	`errMsg = errMsg + "\n\nstdout: \n" + writer.String()`
`63`	`63`	`}`