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

feat(dir2config): defaults

Browse Source
This commit is contained in:
Mikaël Cluseau
2019-02-28 19:27:09 +11:00
parent d2b212ae6b
commit ea6fce68e1
383 changed files with 74236 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/dkl-dir2config/main.go
View File

@ -14,7 +14,9 @@ import (
)
var (
dir = flag.String("in", ".", "Source directory")
dir = flag.String("in", ".", "Source directory")
outPath = flag.String("out", "config.yaml", "Output file")
defaultsPath = flag.String("defaults", "defaults", "Path to the defaults")
src *clustersconfig.Config
dst *localconfig.Config
@ -22,15 +24,13 @@ var (
func loadSrc() {
var err error
src, err = clustersconfig.FromDir(*dir)
src, err = clustersconfig.FromDir(*dir, *defaultsPath)
if err != nil {
log.Fatal("failed to load config from dir: ", err)
}
}
func main() {
outPath := flag.String("out", "config.yaml", "Output file")
flag.Parse()
loadSrc()

7
cmd/dkl-dir2config/render-context.go
View File

@ -81,7 +81,12 @@ func (ctx *renderContext) Config() string {
extraFuncs := ctx.templateFuncs(ctxMap)
extraFuncs["static_pods"] = func(name string) (string, error) {
extraFuncs["static_pods"] = func() (string, error) {
name := ctx.Group.StaticPods
if len(name) == 0 {
return "", fmt.Errorf("group %q has no static pods defined", ctx.Group.Name)
}
t := ctx.clusterConfig.StaticPodsTemplate(name)
if t == nil {
return "", fmt.Errorf("no static pods template named %q", name)