direktil/local-server
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: sync templates and yaml property names

Browse Source
This commit is contained in:
Mikaël Cluseau
2018-06-13 14:12:12 +11:00
parent fb55e74856
commit eff93b8908
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ipxe.go
View File

@ -16,7 +16,7 @@ func renderIPXE(out io.Writer, ctx *renderContext) error {
} }
buf := bytes.NewBuffer(make([]byte, 0, 4096)) buf := bytes.NewBuffer(make([]byte, 0, 4096))
if err := tmpl.Execute(buf, ctx); err != nil { if err := tmpl.Execute(buf, ctx.asMap()); err != nil {
return err return err
} }

28
render-context.go
View File

@ -58,6 +58,8 @@ func (ctx *renderContext) Config() (ba []byte, cfg *config.Config, err error) {
return return
} }
ctxMap := ctx.asMap()
extraFuncs := map[string]interface{}{ extraFuncs := map[string]interface{}{
"static_pods": func(name string) (string, error) { "static_pods": func(name string) (string, error) {
t := ctx.clusterConfig.StaticPodsTemplate(name) t := ctx.clusterConfig.StaticPodsTemplate(name)
@ -66,7 +68,7 @@ func (ctx *renderContext) Config() (ba []byte, cfg *config.Config, err error) {
} }
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
err := t.Execute(buf, ctx, nil) err := t.Execute(buf, ctxMap, nil)
if err != nil { if err != nil {
log.Printf("host %s: failed to render static pods: %v", ctx.Host.Name, err) log.Printf("host %s: failed to render static pods: %v", ctx.Host.Name, err)
return "", err return "", err
@ -77,7 +79,7 @@ func (ctx *renderContext) Config() (ba []byte, cfg *config.Config, err error) {
} }
buf := bytes.NewBuffer(make([]byte, 0, 4096)) buf := bytes.NewBuffer(make([]byte, 0, 4096))
if err = ctx.ConfigTemplate.Execute(buf, ctx, extraFuncs); err != nil { if err = ctx.ConfigTemplate.Execute(buf, ctxMap, extraFuncs); err != nil {
return return
} }
@ -114,7 +116,7 @@ func (ctx *renderContext) StaticPods() (ba []byte, err error) {
} }
buf := bytes.NewBuffer(make([]byte, 0, 4096)) buf := bytes.NewBuffer(make([]byte, 0, 4096))
if err = ctx.StaticPodsTemplate.Execute(buf, ctx, nil); err != nil { if err = ctx.StaticPodsTemplate.Execute(buf, ctx.asMap(), nil); err != nil {
return return
} }
@ -144,3 +146,23 @@ func (ctx *renderContext) Tag() (string, error) {
return hex.EncodeToString(h.Sum(nil)), nil return hex.EncodeToString(h.Sum(nil)), nil
} }
func (ctx *renderContext) asMap() map[string]interface{} {
ba, err := yaml.Marshal(ctx)
if err != nil {
panic(err) // shouldn't happen
}
result := make(map[string]interface{})
if err := yaml.Unmarshal(ba, result); err != nil {
panic(err)
}
// also expand cluster:
cluster := result["cluster"].(map[interface{}]interface{})
cluster["kubernetes_svc_ip"] = ctx.Cluster.KubernetesSvcIP().String()
cluster["dns_svc_ip"] = ctx.Cluster.DNSSvcIP().String()
return result
}