Commit 51227002 authored by Simon Kirsten's avatar Simon Kirsten Committed by Brad Davidson

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

Signed-off-by: 's avatarSimon Kirsten <simonkirsten24@gmail.com> (cherry picked from commit 546dc247) Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent 3b650c97
...@@ -131,6 +131,7 @@ enable_keychain = true ...@@ -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
} }
......
...@@ -179,6 +179,7 @@ func ParseTemplateFromConfig(templateBuffer string, config interface{}) (string, ...@@ -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
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment