ls

cmd/dkl-dir2config/main.go

@@ -1,9 +1,7 @@
 package main
 
 import (
-	"bytes"
 	"flag"
-	"fmt"
 	"log"
 	"os"
 
@@ -44,8 +42,9 @@ func main() {
 	// ----------------------------------------------------------------------
 	for _, cluster := range src.Clusters {
 		dst.Clusters = append(dst.Clusters, &localconfig.Cluster{
-			Name:   cluster.Name,
-			Addons: renderAddons(cluster),
+			Name:          cluster.Name,
+			Addons:        renderAddons(cluster),
+			BootstrapPods: renderBootstrapPodsDS(cluster),
 		})
 	}
 
@@ -104,34 +103,3 @@ func main() {
 	}
 
 }
-
-func renderAddons(cluster *clustersconfig.Cluster) string {
-	if len(cluster.Addons) == 0 {
-		return ""
-	}
-
-	addons := src.Addons[cluster.Addons]
-	if addons == nil {
-		log.Fatalf("cluster %q: no addons with name %q", cluster.Name, cluster.Addons)
-	}
-
-	clusterAsMap := asMap(cluster)
-	clusterAsMap["kubernetes_svc_ip"] = cluster.KubernetesSvcIP().String()
-	clusterAsMap["dns_svc_ip"] = cluster.DNSSvcIP().String()
-
-	buf := &bytes.Buffer{}
-
-	for _, addon := range addons {
-		fmt.Fprintf(buf, "---\n# addon: %s\n", addon.Name)
-		err := addon.Execute(buf, clusterAsMap, nil)
-
-		if err != nil {
-			log.Fatalf("cluster %q: addons %q: failed to render %q: %v",
-				cluster.Name, cluster.Addons, addon.Name, err)
-		}
-
-		fmt.Fprintln(buf)
-	}
-
-	return buf.String()
-}

cmd/dkl-dir2config/render-cluster.go

@@ -0,0 +1,141 @@
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"log"
+
+	yaml "gopkg.in/yaml.v2"
+	"novit.nc/direktil/local-server/pkg/clustersconfig"
+)
+
+func renderClusterTemplates(cluster *clustersconfig.Cluster, setName string,
+	templates []*clustersconfig.Template) []byte {
+	clusterAsMap := asMap(cluster)
+	clusterAsMap["kubernetes_svc_ip"] = cluster.KubernetesSvcIP().String()
+	clusterAsMap["dns_svc_ip"] = cluster.DNSSvcIP().String()
+
+	buf := &bytes.Buffer{}
+
+	for _, t := range templates {
+		fmt.Fprintf(buf, "---\n# %s: %s\n", setName, t.Name)
+		err := t.Execute(buf, clusterAsMap, nil)
+
+		if err != nil {
+			log.Fatalf("cluster %q: %s: failed to render %q: %v",
+				cluster.Name, setName, t.Name, err)
+		}
+
+		fmt.Fprintln(buf)
+	}
+
+	return buf.Bytes()
+}
+
+func renderAddons(cluster *clustersconfig.Cluster) string {
+	if len(cluster.Addons) == 0 {
+		return ""
+	}
+
+	addons := src.Addons[cluster.Addons]
+	if addons == nil {
+		log.Fatalf("cluster %q: no addons with name %q", cluster.Name, cluster.Addons)
+	}
+
+	return string(renderClusterTemplates(cluster, "addons", addons))
+}
+
+type namePod struct {
+	Namespace string
+	Name      string
+	Pod       map[string]interface{}
+}
+
+func renderBootstrapPods(cluster *clustersconfig.Cluster) (pods []namePod) {
+	if cluster.BootstrapPods == "" {
+		return nil
+	}
+
+	bootstrapPods := src.BootstrapPods[cluster.BootstrapPods]
+	if bootstrapPods == nil {
+		log.Fatalf("no bootstrap pods template named %q", cluster.BootstrapPods)
+	}
+
+	// render bootstrap pods
+	buf := bytes.NewBuffer(renderClusterTemplates(cluster, "bootstrap pods", bootstrapPods))
+	dec := yaml.NewDecoder(buf)
+
+	for n := 0; ; n++ {
+		podMap := map[string]interface{}{}
+		err := dec.Decode(podMap)
+
+		if err == io.EOF {
+			break
+		} else if err != nil {
+			log.Fatalf("bootstrap pod %d: failed to parse: %v\n%s", n, err, buf.String())
+		}
+
+		if len(podMap) == 0 {
+			continue
+		}
+
+		if podMap["metadata"] == nil {
+			log.Fatalf("bootstrap pod %d: no metadata\n%s", n, buf.String())
+		}
+
+		md := podMap["metadata"].(map[interface{}]interface{})
+
+		namespace := md["namespace"].(string)
+		name := md["name"].(string)
+
+		pods = append(pods, namePod{namespace, name, podMap})
+	}
+
+	return
+}
+
+func renderBootstrapPodsDS(cluster *clustersconfig.Cluster) string {
+	buf := &bytes.Buffer{}
+	enc := yaml.NewEncoder(buf)
+	for _, namePod := range renderBootstrapPods(cluster) {
+		pod := namePod.Pod
+
+		md := pod["metadata"].(map[interface{}]interface{})
+		labels := md["labels"]
+
+		ann := md["annotations"]
+		annotations := map[interface{}]interface{}{}
+		if ann != nil {
+			annotations = ann.(map[interface{}]interface{})
+		}
+		annotations["node.kubernetes.io/bootstrap-checkpoint"] = "true"
+
+		md["annotations"] = annotations
+
+		delete(md, "name")
+		delete(md, "namespace")
+
+		err := enc.Encode(map[string]interface{}{
+			"apiVersion": "extensions/v1beta1",
+			"kind":       "DaemonSet",
+			"metadata": map[string]interface{}{
+				"namespace": namePod.Namespace,
+				"name":      namePod.Name,
+				"labels":    labels,
+			},
+			"spec": map[string]interface{}{
+				"minReadySeconds": 60,
+				"selector": map[string]interface{}{
+					"matchLabels": labels,
+				},
+				"template": pod,
+			},
+		})
+
+		if err != nil {
+			panic(err)
+		}
+	}
+	return buf.String()
+}

cmd/dkl-dir2config/render-context.go

@@ -4,10 +4,12 @@ import (
 	"bytes"
 	"fmt"
 	"log"
+	"path"
 
 	yaml "gopkg.in/yaml.v2"
 
 	"novit.nc/direktil/local-server/pkg/clustersconfig"
+	"novit.nc/direktil/pkg/config"
 )
 
 type renderContext struct {
@@ -108,6 +110,30 @@ func (ctx *renderContext) Config() string {
 		return render("static pods", t)
 	}
 
+	extraFuncs["bootstrap_pods_files"] = func(dir string) (string, error) {
+		namePods := renderBootstrapPods(ctx.Cluster)
+
+		defs := make([]config.FileDef, 0)
+
+		for _, namePod := range namePods {
+			name := namePod.Namespace + "_" + namePod.Name
+
+			ba, err := yaml.Marshal(namePod.Pod)
+			if err != nil {
+				return "", fmt.Errorf("bootstrap pod %s: failed to render: %v", name, err)
+			}
+
+			defs = append(defs, config.FileDef{
+				Path:    path.Join(dir, name+".yaml"),
+				Mode:    0640,
+				Content: string(ba),
+			})
+		}
+
+		ba, err := yaml.Marshal(defs)
+		return string(ba), err
+	}
+
 	buf := bytes.NewBuffer(make([]byte, 0, 4096))
 	if err := ctx.ConfigTemplate.Execute(buf, ctxMap, extraFuncs); err != nil {
 		log.Fatalf("failed to render config %q for host %q: %v", ctx.Group.Config, ctx.Host.Name, err)

cmd/dkl-local-server/ws-clusters.go

@@ -100,3 +100,18 @@ func wsClusterSetPassword(req *restful.Request, resp *restful.Response) {
 		wsError(resp, err)
 	}
 }
+
+func wsClusterBootstrapPods(req *restful.Request, resp *restful.Response) {
+	cluster := wsReadCluster(req, resp)
+	if cluster == nil {
+		return
+	}
+
+	if len(cluster.BootstrapPods) == 0 {
+		log.Printf("cluster %q has no bootstrap pods defined", cluster.Name)
+		wsNotFound(req, resp)
+		return
+	}
+
+	resp.Write([]byte(cluster.BootstrapPods))
+}