From 6bf622755515ccd89e1f46a1f1d6657d3ffa4782 Mon Sep 17 00:00:00 2001 From: Marek Aufart Date: Fri, 31 May 2024 17:48:56 +0200 Subject: [PATCH] Fix env config load override Signed-off-by: Marek Aufart --- cmd/settings.go | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/cmd/settings.go b/cmd/settings.go index cd2d1761..883a40f3 100644 --- a/cmd/settings.go +++ b/cmd/settings.go @@ -33,6 +33,10 @@ type Config struct { } func (c *Config) Load() error { + err := env.Set(c) + if err != nil { + return err + } if err := c.loadDefaultPodmanBin(); err != nil { return err } @@ -45,10 +49,6 @@ func (c *Config) Load() error { if err := c.loadProviders(); err != nil { return err } - err := env.Set(c) - if err != nil { - return err - } return nil } @@ -85,13 +85,8 @@ func (c *Config) trySetDefaultPodmanBin(file string) (found bool, err error) { } func (c *Config) loadRunnerImg() error { - // TODO(maufart): ensure Config struct works/parses it values from ENV and defaults correctly - runnerImg, found := os.LookupEnv("RUNNER_IMG"); - if !found { - runnerImg = "quay.io/konveyor/kantra" - } // if version tag is given in image - img := strings.TrimSuffix(runnerImg, fmt.Sprintf(":%v", Version)) + img := strings.TrimSuffix(RunnerImage, fmt.Sprintf(":%v", Version)) updatedImg := fmt.Sprintf("%v:%v", img, Version) err := os.Setenv("RUNNER_IMG", updatedImg) if err != nil {