Skip to content

Commit

Permalink
Drop reading from elemental.conf
Browse files Browse the repository at this point in the history
Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com>
  • Loading branch information
Itxaka committed Jul 12, 2023
1 parent 68eb983 commit a1423f7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion internal/agent/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ type Config struct {

func LoadConfig(path ...string) (*Config, error) {
if len(path) == 0 {
path = append(path, "/etc/kairos/agent.yaml", "/etc/elemental/config.yaml")
path = append(path, "/etc/kairos/agent.yaml")

Check warning on line 34 in internal/agent/config.go

View check run for this annotation

Codecov / codecov/patch

internal/agent/config.go#L34

Added line #L34 was not covered by tests
}

cfg := &Config{}
Expand Down
1 change: 0 additions & 1 deletion internal/agent/reset.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ func Reset(debug bool, dir ...string) error {

// This loads yet another config ¬_¬
// TODO: merge this somehow with the rest so there is no 5 places to configure stuff?
// Also this reads the elemental config.yaml
agentConfig, err := LoadConfig()
if err != nil {
return err
Expand Down

0 comments on commit a1423f7

Please sign in to comment.