wip

cmd/dkl-local-server/data.go

@@ -2,10 +2,9 @@ package main
 
 import (
 	"flag"
-	"log"
 	"path/filepath"
 
-	"novit.nc/direktil/pkg/clustersconfig"
+	"novit.nc/direktil/pkg/localconfig"
 )
 
 var (
@@ -13,22 +12,8 @@ var (
 	configFromDir = flag.String("config-from-dir", "", "Build configuration from this directory")
 )
 
-func readConfig() (config *clustersconfig.Config, err error) {
-	configFile := filepath.Join(*dataDir, "current-config.yaml")
+func readConfig() (config *localconfig.Config, err error) {
+	configFile := filepath.Join(*dataDir, "config.yaml")
 
-	if *configFromDir != "" {
-		config, err = clustersconfig.FromDir(*configFromDir)
-		if err != nil {
-			log.Print("failed to load config: ", err)
-			return nil, err
-		}
-
-		if err = config.SaveTo(configFile); err != nil {
-			return nil, err
-		}
-
-		return
-	}
-
-	return clustersconfig.FromFile(configFile)
+	return localconfig.FromFile(configFile)
 }