Merge pull request #2597 from lizardruss/revert-2540

fix: revert #2540 and add tests to prevent future regressions

Author: lizardruss

pkg/devspace/config/config.go

@@ -101,7 +101,7 @@ func Ensure(config Config) Config {
 		retConfig = NewConfig(map[string]interface{}{}, retConfig.RawBeforeConversion(), retConfig.Config(), retConfig.LocalCache(), retConfig.RemoteCache(), retConfig.Variables(), retConfig.Path())
 	}
 	if retConfig.RawBeforeConversion() == nil {
-		retConfig = NewConfig(retConfig.Raw(), map[string]interface{}{}, latest.NewRaw(), retConfig.LocalCache(), retConfig.RemoteCache(), retConfig.Variables(), retConfig.Path())
+		retConfig = NewConfig(retConfig.Raw(), map[string]interface{}{}, retConfig.Config(), retConfig.LocalCache(), retConfig.RemoteCache(), retConfig.Variables(), retConfig.Path())
 	}
 	if retConfig.Config() == nil {
 		retConfig = NewConfig(retConfig.Raw(), retConfig.RawBeforeConversion(), latest.NewRaw(), retConfig.LocalCache(), retConfig.RemoteCache(), retConfig.Variables(), retConfig.Path())

pkg/devspace/config/loader/variable/legacy/replace.go

@@ -175,7 +175,7 @@ func resolveImage(value string, config config2.Config, dependencies []types.Depe
 
 		// try to find the tag for the image
 		tag := originalTag
-		if tag == "" && imageCache.Tag != "" {
+		if imageCache.Tag != "" {
 			tag = imageCache.Tag
 		}
 

pkg/devspace/config/loader/variable/legacy/replace_test.go

@@ -82,6 +82,35 @@ func TestReplaceContainerNames(t *testing.T) {
 				"": "myimage:someTag",
 			},
 		},
+		{
+			name: "Image in cache replaces explicit tag",
+			overwriteValues: map[string]interface{}{
+				"": "myimage:master",
+			},
+			imagesConf: map[string]*latest.Image{
+				"test": {
+					Image: "myimage",
+				},
+			},
+			cache: &localcache.LocalCache{
+				Images: map[string]localcache.ImageCache{
+					"test": {
+						ImageName: "myimage",
+						Tag:       "someTag",
+					},
+				},
+			},
+			builtImages: map[string]buildtypes.ImageNameTag{
+				"test": {
+					ImageName: "myimage",
+					ImageTag:  "someTag",
+				},
+			},
+			expectedShouldRedeploy: true,
+			expectedOverwriteValues: map[string]interface{}{
+				"": "myimage:someTag",
+			},
+		},
 		{
 			name: "Replace image & tag helpers",
 			overwriteValues: map[string]interface{}{