Skip to content

Commit

Permalink
Revert "Fix env config load override"
Browse files Browse the repository at this point in the history
This reverts commit 2950638.

Signed-off-by: Marek Aufart <[email protected]>
  • Loading branch information
aufi committed May 31, 2024
1 parent 6bf6227 commit af1e533
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions cmd/settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ 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
}
Expand All @@ -49,6 +45,10 @@ func (c *Config) Load() error {
if err := c.loadProviders(); err != nil {
return err
}
err := env.Set(c)
if err != nil {
return err
}
return nil
}

Expand Down Expand Up @@ -85,8 +85,13 @@ 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(RunnerImage, fmt.Sprintf(":%v", Version))
img := strings.TrimSuffix(runnerImg, fmt.Sprintf(":%v", Version))
updatedImg := fmt.Sprintf("%v:%v", img, Version)
err := os.Setenv("RUNNER_IMG", updatedImg)
if err != nil {
Expand Down

0 comments on commit af1e533

Please sign in to comment.