From 5a3ed44773e421617ffdca5d61e83c30b2e56445 Mon Sep 17 00:00:00 2001 From: Bronson Mirafuentes Date: Tue, 15 Nov 2022 08:59:05 -0800 Subject: [PATCH] use sprig join for template functions --- .../addons/coredns.addons.k8s.io/k8s-1.12.yaml.template | 4 ++-- upup/pkg/fi/cloudup/template_functions.go | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template index 9ed316c8a9..9d97028732 100644 --- a/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template +++ b/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template @@ -77,13 +77,13 @@ data: ttl 30 } {{- if GossipDomains }} - hosts /rootfs/etc/hosts {{ join GossipDomains " " }} { + hosts /rootfs/etc/hosts {{ join " " GossipDomains }} { ttl 30 fallthrough } {{- end }} prometheus :9153 - forward . {{ or (join KubeDNS.UpstreamNameservers " ") "/etc/resolv.conf" }} { + forward . {{ or (join " " KubeDNS.UpstreamNameservers) "/etc/resolv.conf" }} { max_concurrent 1000 } cache 30 diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go index 11122b96b6..111c30feaa 100644 --- a/upup/pkg/fi/cloudup/template_functions.go +++ b/upup/pkg/fi/cloudup/template_functions.go @@ -91,9 +91,6 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS dest["replace"] = func(s, find, replace string) string { return strings.Replace(s, find, replace, -1) } - dest["join"] = func(a []string, sep string) string { - return strings.Join(a, sep) - } dest["joinHostPort"] = net.JoinHostPort sprigTxtFuncMap := sprig.TxtFuncMap() @@ -103,6 +100,7 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS dest["trimPrefix"] = sprigTxtFuncMap["trimPrefix"] dest["semverCompare"] = sprigTxtFuncMap["semverCompare"] dest["ternary"] = sprigTxtFuncMap["ternary"] + dest["join"] = sprigTxtFuncMap["join"] dest["ClusterName"] = tf.ClusterName dest["WithDefaultBool"] = func(v *bool, defaultValue bool) bool {