fix: resolve issue where skaffold would not add digest when using hel…

…m in v1 -> v2 migration case
GoogleContainerTools · Dec 21, 2022 · a9cfb67 · a9cfb67
1 parent b166d34
commit a9cfb67
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/integration/helm_test.go b/integration/helm_test.go
@@ -41,7 +41,7 @@ func TestHelmDeploy(t *testing.T) {
 	skaffold.Delete().InDir("testdata/helm").InNs(ns.Name).WithEnv(env).RunOrFail(t)
 }
 
-func TestDevHelmMultiConfig(t *testing.T) {
+func TestRunHelmMultiConfig(t *testing.T) {
 	var tests = []struct {
 		description  string
 		dir          string

diff --git a/integration/testdata/helm-multi-config/skaffold/app1/skaffold.yml b/integration/testdata/helm-multi-config/skaffold/app1/skaffold.yml
@@ -15,5 +15,5 @@ manifests:
         createNamespace: true
         name: app1
         setValueTemplates:
-          image.repository: '{{.IMAGE_REPO_app1}}'
-          image.tag: "{{.IMAGE_TAG_app1}}"
+          image.repository: "{{.IMAGE_REPO_app1}}"
+          image.tag: "{{.IMAGE_TAG_app1}}@{{.IMAGE_DIGEST_app1}}"
diff --git a/integration/testdata/helm-multi-config/skaffold/app2/skaffold.yml b/integration/testdata/helm-multi-config/skaffold/app2/skaffold.yml
@@ -15,5 +15,5 @@ manifests:
         createNamespace: true
         name: app2
         setValueTemplates:
-          image.repository: '{{.IMAGE_REPO_app2}}'
-          image.tag: "{{.IMAGE_TAG_app2}}"
+          image.repository: "{{.IMAGE_REPO_app2}}"
+          image.tag: "{{.IMAGE_TAG_app2}}@{{.IMAGE_DIGEST_app2}}"
diff --git a/pkg/skaffold/helm/args.go b/pkg/skaffold/helm/args.go
@@ -76,6 +76,14 @@ func ConstructOverrideArgs(r *latest.HelmRelease, builds []graph.Artifact, args
 			return nil, err
 		}
 
+		// hack required when using new Skaffold v2.X.Y setValueTemplates w/ Skaffold v1.X.Y "imageStrategy: helm"
+		// ex: image: "{{.Values.image.repository}}:{{.Values.image.tag}}"
+		// when the helm template replacements are done with `dev` and `run` there
+		// is an additional `@` suffix inserted that needs to be removed or else deploys will fail
+		if strings.HasPrefix(expandedKey, "IMAGE_") {
+			v = strings.TrimSuffix(v, "@")
+		}
+
 		args = append(args, "--set", fmt.Sprintf("%s=%s", expandedKey, v))
 	}
 

diff --git a/pkg/skaffold/schema/v2beta29/upgrade.go b/pkg/skaffold/schema/v2beta29/upgrade.go
@@ -124,7 +124,7 @@ func upgradeOnePipeline(oldPipeline, newPipeline interface{}) error {
 					if svts == nil {
 						svts = map[string]string{}
 					}
-					svts[k+".tag"] = fmt.Sprintf("{{.IMAGE_TAG_%s}}", validV)
+					svts[k+".tag"] = fmt.Sprintf("{{.IMAGE_TAG_%s}}@{{.IMAGE_DIGEST_%s}}", validV, validV)
 					svts[k+".repository"] = fmt.Sprintf("{{.IMAGE_REPO_%s}}", validV)
 					if oldPL.Deploy.HelmDeploy.Releases[i].ImageStrategy.HelmConventionConfig.ExplicitRegistry {
 						// is 'helm' imageStrategy + explicitRegistry