public_git/helmfile
1
0
Fork 0
mirror of https://github.com/helmfile/helmfile.git synced 2026-10-18 08:19:48 +02:00
Code Issues Projects Releases Wiki Activity

fix: _*.tpl files add whitespace to empty Namespace (#1674)

Browse Source
This commit is contained in:
Chris Doherty
2024-08-22 05:22:45 +08:00
committed by GitHub
parent 4a90fd687b
commit b520e429de
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/state/release.go
+9 -4
View File
@@ -2,6 +2,7 @@ package state
import ( import (
"fmt" "fmt"
"strings"
"github.com/helmfile/helmfile/pkg/maputil" "github.com/helmfile/helmfile/pkg/maputil"
"github.com/helmfile/helmfile/pkg/tmpl" "github.com/helmfile/helmfile/pkg/tmpl"
@@ -19,34 +20,38 @@ func (r ReleaseSpec) ExecuteTemplateExpressions(renderer *tmpl.FileRenderer) (*R
{ {
ts := result.Name ts := result.Name
result.Name, err = renderer.RenderTemplateContentToString([]byte(ts)) name, err := renderer.RenderTemplateContentToString([]byte(ts))
if err != nil { if err != nil {
return nil, fmt.Errorf("failed executing template expressions in release \"%s\".name = \"%s\": %v", r.Name, ts, err) 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 ts := result.Chart
result.Chart, err = renderer.RenderTemplateContentToString([]byte(ts)) chart, err := renderer.RenderTemplateContentToString([]byte(ts))
if err != nil { if err != nil {
return nil, fmt.Errorf("failed executing template expressions in release \"%s\".chart = \"%s\": %v", r.Name, ts, err) 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 ts := result.Namespace
result.Namespace, err = renderer.RenderTemplateContentToString([]byte(ts)) namespace, err := renderer.RenderTemplateContentToString([]byte(ts))
if err != nil { if err != nil {
return nil, fmt.Errorf("failed executing template expressions in release \"%s\".namespace = \"%s\": %v", r.Name, ts, err) 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 ts := result.Version
result.Version, err = renderer.RenderTemplateContentToString([]byte(ts)) version, err := renderer.RenderTemplateContentToString([]byte(ts))
if err != nil { if err != nil {
return nil, fmt.Errorf("failed executing template expressions in release \"%s\".version = \"%s\": %v", r.Name, ts, err) 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 { if result.WaitTemplate != nil {