ls

pkg/clustersconfig/clustersconfig.go

@@ -12,14 +12,15 @@ import (
 )
 
 type Config struct {
-	Hosts        []*Host
-	Groups       []*Group
-	Clusters     []*Cluster
-	Configs      []*Template
-	StaticPods   []*Template `yaml:"static_pods"`
-	Addons       map[string][]*Template
-	SSLConfig    string         `yaml:"ssl_config"`
-	CertRequests []*CertRequest `yaml:"cert_requests"`
+	Hosts         []*Host
+	Groups        []*Group
+	Clusters      []*Cluster
+	Configs       []*Template
+	StaticPods    []*Template            `yaml:"static_pods"`
+	BootstrapPods map[string][]*Template `yaml:"bootstrap_pods"`
+	Addons        map[string][]*Template
+	SSLConfig     string         `yaml:"ssl_config"`
+	CertRequests  []*CertRequest `yaml:"cert_requests"`
 }
 
 func FromBytes(data []byte) (*Config, error) {
@@ -194,10 +195,11 @@ type Vars map[string]interface{}
 // Cluster represents a cluster of hosts, allowing for cluster-wide variables.
 type Cluster struct {
 	WithRev
-	Name    string
-	Domain  string
-	Addons  string
-	Subnets struct {
+	Name          string
+	Domain        string
+	Addons        string
+	BootstrapPods string `yaml:"bootstrap_pods"`
+	Subnets       struct {
 		Services string
 		Pods     string
 	}

pkg/clustersconfig/defaults.go

@@ -99,7 +99,11 @@ func (d *Defaults) List(rev, dir string) (names []string, err error) {
 		return
 	}
 
+	dirPrefix := dir + "/"
 	err = tree.Files().ForEach(func(f *object.File) (err error) {
+		if !strings.HasPrefix(f.Name, dirPrefix) {
+			return
+		}
 		if !strings.HasSuffix(f.Name, ".yaml") {
 			return
 		}

pkg/clustersconfig/dir.go

@@ -37,7 +37,10 @@ func FromDir(dirPath, defaultsPath string) (*Config, error) {
 		return nil
 	}
 
-	config := &Config{Addons: make(map[string][]*Template)}
+	config := &Config{
+		Addons:        make(map[string][]*Template),
+		BootstrapPods: make(map[string][]*Template),
+	}
 
 	// load clusters
 	names, err := store.List("clusters")
@@ -127,7 +130,8 @@ func FromDir(dirPath, defaultsPath string) (*Config, error) {
 		}
 
 		if Debug {
-			log.Printf("group %q: config=%q static_pods=%q", group.Name, group.Config, group.StaticPods)
+			log.Printf("group %q: config=%q static_pods=%q",
+				group.Name, group.Config, group.StaticPods)
 		}
 
 		group.StaticPods, err = template(group.Rev(), "static-pods", group.StaticPods, &config.StaticPods)
@@ -189,6 +193,7 @@ func FromDir(dirPath, defaultsPath string) (*Config, error) {
 		return nil
 	}
 
+	// cluster addons
 	for _, cluster := range config.Clusters {
 		addonSet := cluster.Addons
 		if len(addonSet) == 0 {
@@ -207,6 +212,25 @@ func FromDir(dirPath, defaultsPath string) (*Config, error) {
 		config.Addons[addonSet] = templates
 	}
 
+	// cluster bootstrap pods
+	for _, cluster := range config.Clusters {
+		bpSet := cluster.BootstrapPods
+		if bpSet == "" {
+			continue
+		}
+
+		if _, ok := config.BootstrapPods[bpSet]; ok {
+			continue
+		}
+
+		templates := make([]*Template, 0)
+		if err = loadTemplates(cluster.Rev(), path.Join("bootstrap-pods", bpSet), &templates); err != nil {
+			return nil, err
+		}
+
+		config.BootstrapPods[bpSet] = templates
+	}
+
 	// load SSL configuration
 	if ba, err := ioutil.ReadFile(filepath.Join(dirPath, "ssl-config.json")); err == nil {
 		config.SSLConfig = string(ba)