From 0edfcef6a156495ff1e02aa0284d19bde4a1d37d Mon Sep 17 00:00:00 2001 From: Sunil Shivanand Date: Tue, 10 Jan 2023 15:08:33 +0100 Subject: [PATCH 1/2] Support reading in registries-config via env --- cmd/cluster/clusterCreate.go | 1 + cmd/util/config/config.go | 1 + 2 files changed, 2 insertions(+) diff --git a/cmd/cluster/clusterCreate.go b/cmd/cluster/clusterCreate.go index 0a775e332..c247aabac 100644 --- a/cmd/cluster/clusterCreate.go +++ b/cmd/cluster/clusterCreate.go @@ -331,6 +331,7 @@ func NewCmdClusterCreate() *cobra.Command { cmd.Flags().String("registry-config", "", "Specify path to an extra registries.yaml file") _ = cfgViper.BindPFlag("registries.config", cmd.Flags().Lookup("registry-config")) + _ = cfgViper.BindEnv("registries.config") if err := cmd.MarkFlagFilename("registry-config", "yaml", "yml"); err != nil { l.Log().Fatalln("Failed to mark flag 'config' as filename flag") } diff --git a/cmd/util/config/config.go b/cmd/util/config/config.go index 04fb8ddc2..9a0bce8b4 100644 --- a/cmd/util/config/config.go +++ b/cmd/util/config/config.go @@ -42,6 +42,7 @@ func InitViperWithConfigFile(cfgViper *viper.Viper, configFile string) error { // viper for the general config (file, env and non pre-processed flags) cfgViper.SetEnvPrefix("K3D") cfgViper.AutomaticEnv() + cfgViper.SetEnvKeyReplacer(strings.NewReplacer(".", "_")) cfgViper.SetConfigType("yaml") From 42f404c67d4fdbf814c20881dfa5c1f2b46bb364 Mon Sep 17 00:00:00 2001 From: Sunil Shivanand Date: Wed, 11 Jan 2023 14:45:53 +0100 Subject: [PATCH 2/2] Remove unnecessary call to BindEnv Signed-off-by: Sunil Shivanand --- cmd/cluster/clusterCreate.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/cluster/clusterCreate.go b/cmd/cluster/clusterCreate.go index c247aabac..0a775e332 100644 --- a/cmd/cluster/clusterCreate.go +++ b/cmd/cluster/clusterCreate.go @@ -331,7 +331,6 @@ func NewCmdClusterCreate() *cobra.Command { cmd.Flags().String("registry-config", "", "Specify path to an extra registries.yaml file") _ = cfgViper.BindPFlag("registries.config", cmd.Flags().Lookup("registry-config")) - _ = cfgViper.BindEnv("registries.config") if err := cmd.MarkFlagFilename("registry-config", "yaml", "yml"); err != nil { l.Log().Fatalln("Failed to mark flag 'config' as filename flag") }