fix: helm-deploy-chart-path-template (#9243)

* fix: helm-deploy-chart-path-template

* chore: add tests back

integration/run_test.go

@@ -146,6 +146,13 @@ var tests = []struct {
 		dir:         "examples/custom",
 		pods:        []string{"getting-started-custom"},
 	},
+	{
+		description: "helm templating charPath",
+		dir:         "testdata/helm",
+		args:        []string{"-p", "helm-templating-charPath"},
+		deployments: []string{"skaffold-helm"},
+		env:         []string{"FOO=skaffold-helm"},
+	},
 	// TODO(#8811): Enable this test when issue is solve.
 	// {
 	// 	description: "buildpacks Go",

integration/testdata/helm/skaffold.yaml

@@ -43,4 +43,10 @@ profiles:
       releases:
         # seed test namespace in the release name.
         - name: skaffold-helm-{{.TEST_NS}}
-          chartPath: skaffold-helm
+          chartPath: skaffold-helm
+- name: helm-templating-charPath
+  deploy:
+    helm:
+      releases:
+        - name: skaffold-helm
+          chartPath: '{{.FOO}}'

pkg/skaffold/deploy/helm/helm.go

@@ -276,6 +276,11 @@ func (h *Deployer) Deploy(ctx context.Context, out io.Writer, builds []graph.Art
 		if err != nil {
 			return helm.UserErr(fmt.Sprintf("cannot expand repo %q", r.Repo), err)
 		}
+		r.ChartPath, err = util.ExpandEnvTemplateOrFail(r.ChartPath, nil)
+		if err != nil {
+			return helm.UserErr(fmt.Sprintf("cannot expand chart path %q", r.ChartPath), err)
+		}
+
 		m, results, err := h.deployRelease(ctx, out, releaseName, r, builds, h.bV, chartVersion, repo)
 		if err != nil {
 			return helm.UserErr(fmt.Sprintf("deploying %q", releaseName), err)