dilim/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-08-13 17:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(helm): fix linter test panic

Browse Source 
Handle a previously unhandled error in the linter. This simply bails out
if a chart's values files do not parse.

Also, changed the implementation of CoalesceValues to return a map even
on error.
This commit is contained in:
Matt Butcher
2016-06-30 12:45:44 -06:00
parent 81fd9edf4d
commit 310ef9bbcb
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/chartutil/values.go
View File

@@ -312,7 +312,7 @@ func ToRenderValues(chrt *chart.Chart, chrtVals *chart.Config, options ReleaseOp
vals, err := CoalesceValues(chrt, chrtVals, nil)
if err != nil {
return nil, err
return overrides, err
}
overrides["Values"] = vals

6
pkg/lint/rules/template.go
View File

@@ -55,6 +55,12 @@ func Templates(linter *support.Linter) {
options := chartutil.ReleaseOptions{Name: "testRelease", Time: timeconv.Now(), Namespace: "testNamespace"}
valuesToRender, err := chartutil.ToRenderValues(chart, chart.Values, options)
if err != nil {
// FIXME: This seems to generate a duplicate, but I can't find where the first
// error is coming from.
//linter.RunLinterRule(support.ErrorSev, err)
return
}
renderedContentMap, err := engine.New().Render(chart, valuesToRender)
renderOk := linter.RunLinterRule(support.ErrorSev, validateNoError(err))