upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-05-28 04:35:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #919 from technosophos/fix/918-fix-lint-test

Browse source 
fix(helm): fix linter test panic
This commit is contained in:
Matt Butcher 2016-06-30 13:03:53 -06:00 committed by GitHub
commit eee6e143d8
2 changed files with 7 additions and 1 deletions
Show stats 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))