github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add support for `{{ template "base" . }}` in etc/containerd/config.toml.tmpl (#7991) 

Signed-off-by: Simon Kirsten <simonkirsten24@gmail.com>
(cherry picked from commit 546dc247a0)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/8169/head
Simon Kirsten 2023-07-31 22:36:23 +02:00 committed by Brad Davidson
parent ba8cb071e7
commit 739141a79b
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/agent/templates/templates_linux.go
View File

@ -131,6 +131,7 @@ enable_keychain = true
func ParseTemplateFromConfig(templateBuffer string, config interface{}) (string, error) { func ParseTemplateFromConfig(templateBuffer string, config interface{}) (string, error) {
out := new(bytes.Buffer) out := new(bytes.Buffer)
t := template.Must(template.New("compiled_template").Parse(templateBuffer)) t := template.Must(template.New("compiled_template").Parse(templateBuffer))
template.Must(t.New("base").Parse(ContainerdConfigTemplate))
if err := t.Execute(out, config); err != nil { if err := t.Execute(out, config); err != nil {
return "", err return "", err
} }

1
pkg/agent/templates/templates_windows.go
View File

@ -179,6 +179,7 @@ func ParseTemplateFromConfig(templateBuffer string, config interface{}) (string,
}, },
} }
t := template.Must(template.New("compiled_template").Funcs(funcs).Parse(templateBuffer)) t := template.Must(template.New("compiled_template").Funcs(funcs).Parse(templateBuffer))
template.Must(t.New("base").Parse(ContainerdConfigTemplate))
if err := t.Execute(out, config); err != nil { if err := t.Execute(out, config); err != nil {
return "", err return "", err
} }