From b520e429de0a780ee420fca470dcaba1ff44bebf Mon Sep 17 00:00:00 2001 From: Chris Doherty Date: Wed, 21 Aug 2024 16:22:45 -0500 Subject: [PATCH] fix: _*.tpl files add whitespace to empty Namespace (#1674) --- pkg/state/release.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkg/state/release.go b/pkg/state/release.go index 6f8d78d4..5cedcf91 100644 --- a/pkg/state/release.go +++ b/pkg/state/release.go @@ -2,6 +2,7 @@ package state import ( "fmt" + "strings" "github.com/helmfile/helmfile/pkg/maputil" "github.com/helmfile/helmfile/pkg/tmpl" @@ -19,34 +20,38 @@ func (r ReleaseSpec) ExecuteTemplateExpressions(renderer *tmpl.FileRenderer) (*R { ts := result.Name - result.Name, err = renderer.RenderTemplateContentToString([]byte(ts)) + name, err := renderer.RenderTemplateContentToString([]byte(ts)) if err != nil { return nil, fmt.Errorf("failed executing template expressions in release \"%s\".name = \"%s\": %v", r.Name, ts, err) } + result.Name = strings.TrimSpace(name) } { ts := result.Chart - result.Chart, err = renderer.RenderTemplateContentToString([]byte(ts)) + chart, err := renderer.RenderTemplateContentToString([]byte(ts)) if err != nil { return nil, fmt.Errorf("failed executing template expressions in release \"%s\".chart = \"%s\": %v", r.Name, ts, err) } + result.Chart = strings.TrimSpace(chart) } { ts := result.Namespace - result.Namespace, err = renderer.RenderTemplateContentToString([]byte(ts)) + namespace, err := renderer.RenderTemplateContentToString([]byte(ts)) if err != nil { return nil, fmt.Errorf("failed executing template expressions in release \"%s\".namespace = \"%s\": %v", r.Name, ts, err) } + result.Namespace = strings.TrimSpace(namespace) } { ts := result.Version - result.Version, err = renderer.RenderTemplateContentToString([]byte(ts)) + version, err := renderer.RenderTemplateContentToString([]byte(ts)) if err != nil { return nil, fmt.Errorf("failed executing template expressions in release \"%s\".version = \"%s\": %v", r.Name, ts, err) } + result.Version = strings.TrimSpace(version) } if result.WaitTemplate != nil {