Skip to content

Commit 385401b

Browse files
authored
helm/kustomize generator: fix lookup issues with include/tpl (#79)
1 parent 3999826 commit 385401b

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

pkg/manifests/helm/generator.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func NewHelmGenerator(fsys fs.FS, chartPath string, clnt client.Client) (*HelmGe
161161
t.Option("missingkey=zero").
162162
Funcs(sprig.TxtFuncMap()).
163163
Funcs(templatex.FuncMap()).
164-
Funcs(templatex.FuncMapForTemplate(t)).
164+
Funcs(templatex.FuncMapForTemplate(nil)).
165165
Funcs(templatex.FuncMapForLocalClient(clnt)).
166166
Funcs(templatex.FuncMapForClient(nil))
167167
} else {
@@ -280,6 +280,7 @@ func (g *HelmGenerator) Generate(ctx context.Context, namespace string, name str
280280
return nil, err
281281
}
282282
t0.Option("missingkey=zero").
283+
Funcs(templatex.FuncMapForTemplate(t0)).
283284
Funcs(templatex.FuncMapForClient(clnt))
284285
}
285286
for _, t := range g.templates {

pkg/manifests/kustomize/generator.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func NewKustomizeGenerator(fsys fs.FS, kustomizationPath string, templateSuffix
104104
t.Option("missingkey=zero").
105105
Funcs(sprig.TxtFuncMap()).
106106
Funcs(templatex.FuncMap()).
107-
Funcs(templatex.FuncMapForTemplate(t)).
107+
Funcs(templatex.FuncMapForTemplate(nil)).
108108
Funcs(templatex.FuncMapForLocalClient(clnt)).
109109
Funcs(templatex.FuncMapForClient(nil)).
110110
Funcs(funcMapForGenerateContext(nil, nil, "", ""))
@@ -187,6 +187,7 @@ func (g *KustomizeGenerator) Generate(ctx context.Context, namespace string, nam
187187
return nil, err
188188
}
189189
t0.Option("missingkey=zero").
190+
Funcs(templatex.FuncMapForTemplate(t0)).
190191
Funcs(templatex.FuncMapForClient(clnt)).
191192
Funcs(funcMapForGenerateContext(serverInfo, component, namespace, name))
192193
}

0 commit comments

Comments
 (0)