From 4555b204c238d7ae610a366d88a2725ed346ad23 Mon Sep 17 00:00:00 2001 From: kyra Date: Fri, 19 Dec 2025 07:12:06 +0800 Subject: [PATCH 1/2] feat: Support templating version of helm chart while render --- pkg/skaffold/render/renderer/helm/helm.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/skaffold/render/renderer/helm/helm.go b/pkg/skaffold/render/renderer/helm/helm.go index 42caee272aa..45adda34c55 100644 --- a/pkg/skaffold/render/renderer/helm/helm.go +++ b/pkg/skaffold/render/renderer/helm/helm.go @@ -183,6 +183,11 @@ func (h Helm) generateHelmManifest(ctx context.Context, builds []graph.Artifact, return nil, helm.UserErr(fmt.Sprintf("cannot expand chart path %q", release.ChartPath), err) } + release.Version, err = sUtil.ExpandEnvTemplateOrFail(release.Version, nil) + if err != nil { + return nil, helm.UserErr(fmt.Sprintf("cannot expand chart version %q", release.Version), err) + } + namespace, err := helm.ReleaseNamespace(h.namespace, release) if err != nil { return nil, err From 534050d25c5d4a7a93dbf277c788f6bbb971125c Mon Sep 17 00:00:00 2001 From: kyra Date: Fri, 19 Dec 2025 07:24:55 +0800 Subject: [PATCH 2/2] fix: return meaningful message when template expansion fails --- pkg/skaffold/render/renderer/helm/helm.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/skaffold/render/renderer/helm/helm.go b/pkg/skaffold/render/renderer/helm/helm.go index 45adda34c55..e14102ced1c 100644 --- a/pkg/skaffold/render/renderer/helm/helm.go +++ b/pkg/skaffold/render/renderer/helm/helm.go @@ -178,15 +178,17 @@ func (h Helm) generateHelmManifest(ctx context.Context, builds []graph.Artifact, return nil, helm.UserErr(fmt.Sprintf("cannot expand release name %q", release.Name), err) } - release.ChartPath, err = sUtil.ExpandEnvTemplateOrFail(release.ChartPath, nil) + chartPath, err := sUtil.ExpandEnvTemplateOrFail(release.ChartPath, nil) if err != nil { return nil, helm.UserErr(fmt.Sprintf("cannot expand chart path %q", release.ChartPath), err) } + release.ChartPath = chartPath - release.Version, err = sUtil.ExpandEnvTemplateOrFail(release.Version, nil) + version, err := sUtil.ExpandEnvTemplateOrFail(release.Version, nil) if err != nil { return nil, helm.UserErr(fmt.Sprintf("cannot expand chart version %q", release.Version), err) } + release.Version = version namespace, err := helm.ReleaseNamespace(h.namespace, release) if err != nil {