Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericzzzzzzz merged 2 commits into from
Jan 8, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37dda0c
fix: helm-deploy-chart-path-template
ericzzzzzzz Jan 8, 2024
4b7a89a
chore: add tests back
ericzzzzzzz Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions integration/run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 7 additions & 1 deletion integration/testdata/helm/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}'
5 changes: 5 additions & 0 deletions pkg/skaffold/deploy/helm/helm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down