fix helm template output-dir

helm template validation silently skipped if output-dir flag is set

Signed-off-by: Zhou Hao <zhouhao@cn.fujitsu.com>
pull/9026/head
Zhou Hao 5 years ago
parent 3f2605df5f
commit c4f6e77cff

@ -183,22 +183,19 @@ func (c *Configuration) renderResources(ch *chart.Chart, values chartutil.Values
if includeCrds { if includeCrds {
for _, crd := range ch.CRDObjects() { for _, crd := range ch.CRDObjects() {
if outputDir == "" { if outputDir != "" {
fmt.Fprintf(b, "---\n# Source: %s\n%s\n", crd.Name, string(crd.File.Data[:]))
} else {
err = writeToFile(outputDir, crd.Filename, string(crd.File.Data[:]), fileWritten[crd.Name]) err = writeToFile(outputDir, crd.Filename, string(crd.File.Data[:]), fileWritten[crd.Name])
if err != nil { if err != nil {
return hs, b, "", err return hs, b, "", err
} }
fileWritten[crd.Name] = true fileWritten[crd.Name] = true
} }
fmt.Fprintf(b, "---\n# Source: %s\n%s\n", crd.Name, string(crd.File.Data[:]))
} }
} }
for _, m := range manifests { for _, m := range manifests {
if outputDir == "" { if outputDir != "" {
fmt.Fprintf(b, "---\n# Source: %s\n%s\n", m.Name, m.Content)
} else {
newDir := outputDir newDir := outputDir
if useReleaseName { if useReleaseName {
newDir = filepath.Join(outputDir, releaseName) newDir = filepath.Join(outputDir, releaseName)
@ -213,6 +210,7 @@ func (c *Configuration) renderResources(ch *chart.Chart, values chartutil.Values
} }
fileWritten[m.Name] = true fileWritten[m.Name] = true
} }
fmt.Fprintf(b, "---\n# Source: %s\n%s\n", m.Name, m.Content)
} }
if pr != nil { if pr != nil {

Loading…
Cancel
Save