bootv2 support

cmd/dkl-dir2config/render-context.go

@@ -11,20 +11,23 @@ import (
 
 	yaml "gopkg.in/yaml.v2"
 
-	"novit.nc/direktil/local-server/pkg/clustersconfig"
-	"novit.nc/direktil/pkg/config"
+	"novit.tech/direktil/pkg/config"
+
+	"novit.tech/direktil/local-server/pkg/clustersconfig"
 )
 
 type renderContext struct {
 	Labels      map[string]string
 	Annotations map[string]string
 
-	Host               *clustersconfig.Host
-	Group              *clustersconfig.Group
-	Cluster            *clustersconfig.Cluster
-	Vars               map[string]interface{}
-	ConfigTemplate     *clustersconfig.Template
-	StaticPodsTemplate *clustersconfig.Template
+	Host    *clustersconfig.Host
+	Group   *clustersconfig.Group
+	Cluster *clustersconfig.Cluster
+	Vars    map[string]interface{}
+
+	BootstrapConfigTemplate *clustersconfig.Template
+	ConfigTemplate          *clustersconfig.Template
+	StaticPodsTemplate      *clustersconfig.Template
 
 	clusterConfig *clustersconfig.Config
 }
@@ -56,12 +59,14 @@ func newRenderContext(host *clustersconfig.Host, cfg *clustersconfig.Config) (ct
 		Labels:      mergeLabels(cluster.Labels, group.Labels, host.Labels),
 		Annotations: mergeLabels(cluster.Annotations, group.Annotations, host.Annotations),
 
-		Host:               host,
-		Group:              group,
-		Cluster:            cluster,
-		Vars:               vars,
-		ConfigTemplate:     cfg.ConfigTemplate(group.Config),
-		StaticPodsTemplate: cfg.StaticPodsTemplate(group.StaticPods),
+		Host:    host,
+		Group:   group,
+		Cluster: cluster,
+		Vars:    vars,
+
+		BootstrapConfigTemplate: cfg.ConfigTemplate(group.BootstrapConfig),
+		ConfigTemplate:          cfg.ConfigTemplate(group.Config),
+		StaticPodsTemplate:      cfg.StaticPodsTemplate(group.StaticPods),
 
 		clusterConfig: cfg,
 	}, nil
@@ -134,11 +139,21 @@ func (ctx *renderContext) Name() string {
 	}
 }
 
+func (ctx *renderContext) BootstrapConfig() string {
+	if ctx.BootstrapConfigTemplate == nil {
+		log.Fatalf("no such (bootstrap) config: %q", ctx.Group.BootstrapConfig)
+	}
+	return ctx.renderConfig(ctx.BootstrapConfigTemplate)
+}
+
 func (ctx *renderContext) Config() string {
 	if ctx.ConfigTemplate == nil {
 		log.Fatalf("no such config: %q", ctx.Group.Config)
 	}
+	return ctx.renderConfig(ctx.ConfigTemplate)
+}
 
+func (ctx *renderContext) renderConfig(configTemplate *clustersconfig.Template) string {
 	ctxName := ctx.Name()
 
 	ctxMap := ctx.asMap()
@@ -203,7 +218,7 @@ func (ctx *renderContext) Config() string {
 	}
 
 	buf := bytes.NewBuffer(make([]byte, 0, 4096))
-	if err := ctx.ConfigTemplate.Execute(ctxName, "config", buf, ctxMap, extraFuncs); err != nil {
+	if err := configTemplate.Execute(ctxName, "config", buf, ctxMap, extraFuncs); err != nil {
 		log.Fatalf("failed to render config %q for host %q: %v", ctx.Group.Config, ctx.Host.Name, err)
 	}