dir2config: switch to includes instead of ad-hoc defaults

pkg/clustersconfig/clustersconfig.go

@@ -25,7 +25,6 @@ var (
 
 type Config struct {
 	Hosts         []*Host
-	Groups        []*Group
 	Clusters      []*Cluster
 	Configs       []*Template
 	StaticPods    []*Template            `yaml:"static_pods"`
@@ -89,15 +88,6 @@ func (c *Config) HostByMAC(mac string) *Host {
 	return nil
 }
 
-func (c *Config) Group(name string) *Group {
-	for _, group := range c.Groups {
-		if group.Name == name {
-			return group
-		}
-	}
-	return nil
-}
-
 func (c *Config) Cluster(name string) *Cluster {
 	for _, cluster := range c.Clusters {
 		if cluster.Name == name {
@@ -116,15 +106,6 @@ func (c *Config) ConfigTemplate(name string) *Template {
 	return nil
 }
 
-func (c *Config) StaticPodsTemplate(name string) *Template {
-	for _, s := range c.StaticPods {
-		if s.Name == name {
-			return s
-		}
-	}
-	return nil
-}
-
 func (c *Config) CSR(name string) *CertRequest {
 	for _, s := range c.CertRequests {
 		if s.Name == name {
@@ -146,30 +127,25 @@ func (c *Config) SaveTo(path string) error {
 type Template struct {
 	Name     string
 	Template string
-
-	parsedTemplate *template.Template
 }
 
 func (t *Template) Execute(contextName, elementName string, wr io.Writer, data interface{}, extraFuncs map[string]interface{}) error {
-	if t.parsedTemplate == nil {
-		var templateFuncs = map[string]interface{}{
-			"indent": func(indent, s string) (indented string) {
-				indented = indent + strings.Replace(s, "\n", "\n"+indent, -1)
-				return
-			},
-		}
+	var templateFuncs = map[string]interface{}{
+		"indent": func(indent, s string) (indented string) {
+			indented = indent + strings.Replace(s, "\n", "\n"+indent, -1)
+			return
+		},
+	}
 
-		for name, f := range extraFuncs {
-			templateFuncs[name] = f
-		}
+	for name, f := range extraFuncs {
+		templateFuncs[name] = f
+	}
 
-		tmpl, err := template.New(t.Name).
-			Funcs(templateFuncs).
-			Parse(t.Template)
-		if err != nil {
-			return err
-		}
-		t.parsedTemplate = tmpl
+	tmpl, err := template.New(t.Name).
+		Funcs(templateFuncs).
+		Parse(t.Template)
+	if err != nil {
+		return err
 	}
 
 	if *templateDetailsDir != "" {
@@ -204,7 +180,7 @@ func (t *Template) Execute(contextName, elementName string, wr io.Writer, data i
 		wr = io.MultiWriter(wr, out)
 	}
 
-	return t.parsedTemplate.Execute(wr, data)
+	return tmpl.Execute(wr, data)
 }
 
 // Host represents a host served by this server.
@@ -220,26 +196,17 @@ type Host struct {
 	IPs     []string
 	Cluster string
 	Group   string
-	Vars    Vars
-}
 
-// Group represents a group of hosts and provides their configuration.
-type Group struct {
-	WithRev
-
-	Name        string
-	Labels      map[string]string
-	Annotations map[string]string
-
-	Master          bool
 	IPXE            string
 	Kernel          string
 	Initrd          string
 	BootstrapConfig string `yaml:"bootstrap_config"`
 	Config          string
-	StaticPods      string `yaml:"static_pods"`
 	Versions        map[string]string
-	Vars            Vars
+
+	BootstrapPods string `yaml:"bootstrap_pods"`
+
+	Vars Vars
 }
 
 // Vars store user-defined key-values
@@ -253,13 +220,13 @@ type Cluster struct {
 	Labels      map[string]string
 	Annotations map[string]string
 
-	Domain        string
-	Addons        string
-	BootstrapPods string `yaml:"bootstrap_pods"`
-	Subnets       struct {
+	Domain  string
+	Addons  string
+	Subnets struct {
 		Services string
 		Pods     string
 	}
+
 	Vars Vars
 }
 
@@ -274,7 +241,7 @@ func (c *Cluster) DNSSvcIP() net.IP {
 func (c *Cluster) NthSvcIP(n byte) net.IP {
 	_, cidr, err := net.ParseCIDR(c.Subnets.Services)
 	if err != nil {
-		panic(fmt.Errorf("Invalid services CIDR: %v", err))
+		panic(fmt.Errorf("invalid services CIDR: %v", err))
 	}
 
 	ip := cidr.IP