cmd/dkl-dir2config/render-cluster.go

@@ -52,7 +52,7 @@ func clusterFuncs(clusterSpec *clustersconfig.Cluster) map[string]interface{} {
 
 		"hosts_by_group": func(group string) (hosts []interface{}) {
 			for _, host := range src.Hosts {
-				if host.Cluster == cluster && host.Group == group {
+				if host.Group == group {
 					hosts = append(hosts, asMap(host))
 				}
 			}
@@ -101,18 +101,12 @@ func renderAddons(cluster *clustersconfig.Cluster) string {
 		return ""
 	}
 
-	buf := new(bytes.Buffer)
-
-	for _, addonSet := range cluster.Addons {
-		addons := src.Addons[addonSet]
-		if addons == nil {
-			log.Fatalf("cluster %q: no addons with name %q", cluster.Name, addonSet)
-		}
-
-		buf.Write(renderClusterTemplates(cluster, "addons", addons))
+	addons := src.Addons[cluster.Addons]
+	if addons == nil {
+		log.Fatalf("cluster %q: no addons with name %q", cluster.Name, cluster.Addons)
 	}
 
-	return buf.String()
+	return string(renderClusterTemplates(cluster, "addons", addons))
 }
 
 type namePod struct {

pkg/clustersconfig/clustersconfig.go

@@ -135,11 +135,6 @@ func (t *Template) Execute(contextName, elementName string, wr io.Writer, data i
 			indented = indent + strings.Replace(s, "\n", "\n"+indent, -1)
 			return
 		},
-		"yaml": func(v any) (s string, err error) {
-			ba, err := yaml.Marshal(v)
-			s = string(ba)
-			return
-		},
 	}
 
 	for name, f := range extraFuncs {
@@ -226,7 +221,7 @@ type Cluster struct {
 	Annotations map[string]string
 
 	Domain  string
-	Addons  []string
+	Addons  string
 	Subnets struct {
 		Services string
 		Pods     string

pkg/clustersconfig/dir.go

@@ -102,23 +102,21 @@ func FromDir(
 
 	// cluster addons
 	for _, cluster := range config.Clusters {
-		addonSets := cluster.Addons
-		if len(addonSets) == 0 {
+		addonSet := cluster.Addons
+		if len(addonSet) == 0 {
 			continue
 		}
 
-		for _, addonSet := range addonSets {
-			if _, ok := config.Addons[addonSet]; ok {
-				continue
-			}
-
-			templates := make([]*Template, 0)
-			if err = loadTemplates(path.Join("addons", addonSet), &templates); err != nil {
-				return nil, err
-			}
-
-			config.Addons[addonSet] = templates
+		if _, ok := config.Addons[addonSet]; ok {
+			continue
 		}
+
+		templates := make([]*Template, 0)
+		if err = loadTemplates(path.Join("addons", addonSet), &templates); err != nil {
+			return nil, err
+		}
+
+		config.Addons[addonSet] = templates
 	}
 
 	// cluster bootstrap pods