From a9454af71be02faf5aa772921b4579ab2d552f22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Cluseau?= Date: Wed, 30 Jan 2019 13:56:45 +1100 Subject: [PATCH] sanity --- cmd/dkl-dir2config/main.go | 4 ++++ cmd/dkl-local-server/data.go | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/dkl-dir2config/main.go b/cmd/dkl-dir2config/main.go index 01162a2..e7426ae 100644 --- a/cmd/dkl-dir2config/main.go +++ b/cmd/dkl-dir2config/main.go @@ -100,6 +100,10 @@ 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) diff --git a/cmd/dkl-local-server/data.go b/cmd/dkl-local-server/data.go index c395b59..37d42bc 100644 --- a/cmd/dkl-local-server/data.go +++ b/cmd/dkl-local-server/data.go @@ -8,8 +8,7 @@ import ( ) var ( - dataDir = flag.String("data", "/var/lib/direktil", "Data dir") - configFromDir = flag.String("config-from-dir", "", "Build configuration from this directory") + dataDir = flag.String("data", "/var/lib/direktil", "Data dir") ) func configFilePath() string {