kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use sprig join for template functions

This commit is contained in:
Bronson Mirafuentes 2022-11-15 08:59:05 -08:00
parent 591fbf856a
commit 5a3ed44773
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template
View File

@ -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

4
upup/pkg/fi/cloudup/template_functions.go
View File

@ -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 {