direktil/local-server
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dir2config: hosts_by_group returns maps

Browse Source
This commit is contained in:
Mikaël Cluseau
2019-10-16 16:46:04 +11:00
parent d27c4ed7a3
commit 50ee480caf
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/dkl-dir2config/render-cluster.go
View File

@ -38,10 +38,10 @@ func clusterFuncs(clusterSpec *clustersconfig.Cluster) map[string]interface{} {
return fmt.Sprintf("{{ ca_dir %q %q }}", cluster, name), nil return fmt.Sprintf("{{ ca_dir %q %q }}", cluster, name), nil
}, },
"hosts_by_group": func(group string) (hosts []*clustersconfig.Host) { "hosts_by_group": func(group string) (hosts []interface{}) {
for _, host := range src.Hosts { for _, host := range src.Hosts {
if host.Group == group { if host.Group == group {
hosts = append(hosts, host) hosts = append(hosts, asMap(host))
} }
} }
@ -60,6 +60,8 @@ func renderClusterTemplates(cluster *clustersconfig.Cluster, setName string,
clusterAsMap["kubernetes_svc_ip"] = cluster.KubernetesSvcIP().String() clusterAsMap["kubernetes_svc_ip"] = cluster.KubernetesSvcIP().String()
clusterAsMap["dns_svc_ip"] = cluster.DNSSvcIP().String() clusterAsMap["dns_svc_ip"] = cluster.DNSSvcIP().String()
funcs := clusterFuncs(cluster)
log.Print("rendering cluster templates with ", clusterAsMap) log.Print("rendering cluster templates with ", clusterAsMap)
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
@ -67,7 +69,7 @@ func renderClusterTemplates(cluster *clustersconfig.Cluster, setName string,
for _, t := range templates { for _, t := range templates {
log.Print("- template: ", setName, ": ", t.Name) log.Print("- template: ", setName, ": ", t.Name)
fmt.Fprintf(buf, "---\n# %s: %s\n", setName, t.Name) fmt.Fprintf(buf, "---\n# %s: %s\n", setName, t.Name)
err := t.Execute(buf, clusterAsMap, clusterFuncs(cluster)) err := t.Execute(buf, clusterAsMap, funcs)
if err != nil { if err != nil {
log.Fatalf("cluster %q: %s: failed to render %q: %v", log.Fatalf("cluster %q: %s: failed to render %q: %v",