mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix templater: Guard against empty values map

Browse source
This commit is contained in:
Vincent Ambo 2017-02-08 13:47:56 +01:00
parent a1c23d7018
commit 3ef0f35bfe
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
templater/templater.go
View file

@ -99,6 +99,11 @@ func templateFile(c *context.Context, rs *context.ResourceSet, filename string)
var b bytes.Buffer
// Guard against empty map before merging keys
if rs.Values == nil {
rs.Values = make(map[string]interface{}, 0)
}
// Merge global and resourceset-specific values (don't override from global)
for k, v := range c.Global {
if _, ok := rs.Values[k]; !ok {