From c4f6e77cffc2044d904127f8d7b3900ce60ea406 Mon Sep 17 00:00:00 2001 From: Zhou Hao Date: Mon, 16 Nov 2020 20:49:44 +0800 Subject: [PATCH] fix helm template output-dir helm template validation silently skipped if output-dir flag is set Signed-off-by: Zhou Hao --- pkg/action/action.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/action/action.go b/pkg/action/action.go index 79bb4f638..bcefec726 100644 --- a/pkg/action/action.go +++ b/pkg/action/action.go @@ -183,22 +183,19 @@ func (c *Configuration) renderResources(ch *chart.Chart, values chartutil.Values if includeCrds { for _, crd := range ch.CRDObjects() { - if outputDir == "" { - fmt.Fprintf(b, "---\n# Source: %s\n%s\n", crd.Name, string(crd.File.Data[:])) - } else { + if outputDir != "" { err = writeToFile(outputDir, crd.Filename, string(crd.File.Data[:]), fileWritten[crd.Name]) if err != nil { return hs, b, "", err } fileWritten[crd.Name] = true } + fmt.Fprintf(b, "---\n# Source: %s\n%s\n", crd.Name, string(crd.File.Data[:])) } } for _, m := range manifests { - if outputDir == "" { - fmt.Fprintf(b, "---\n# Source: %s\n%s\n", m.Name, m.Content) - } else { + if outputDir != "" { newDir := outputDir if useReleaseName { newDir = filepath.Join(outputDir, releaseName) @@ -213,6 +210,7 @@ func (c *Configuration) renderResources(ch *chart.Chart, values chartutil.Values } fileWritten[m.Name] = true } + fmt.Fprintf(b, "---\n# Source: %s\n%s\n", m.Name, m.Content) } if pr != nil {