From 2d4678333cfd5547ddf9f61cadd4bcec5871316a Mon Sep 17 00:00:00 2001 From: Kimmo Lehto Date: Mon, 7 Mar 2022 13:00:56 +0200 Subject: [PATCH 1/3] Delete k0s config on reset --- phase/reset.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/phase/reset.go b/phase/reset.go index d4b9435c..6a127042 100644 --- a/phase/reset.go +++ b/phase/reset.go @@ -76,6 +76,10 @@ func (p *Reset) Run() error { } } - return err + if err := h.Configurer.DeleteFile(h, h.Configurer.K0sConfigPath()); err != nil { + log.Warnf("%s: failed to remove existing configuration %s: %s", h, h.Configurer.K0sConfigPath(), err) + } + + return nil }) } From ea1d4145284add6f5045247d182d991a74893c9b Mon Sep 17 00:00:00 2001 From: Kimmo Lehto Date: Mon, 7 Mar 2022 13:07:14 +0200 Subject: [PATCH 2/3] Return original error --- phase/reset.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phase/reset.go b/phase/reset.go index 6a127042..b5cc2336 100644 --- a/phase/reset.go +++ b/phase/reset.go @@ -66,11 +66,11 @@ func (p *Reset) Run() error { } log.Infof("%s: running k0s reset", h) - out, err := h.ExecOutput(h.Configurer.K0sCmdf("reset"), exec.Sudo(h)) + out, rErr := h.ExecOutput(h.Configurer.K0sCmdf("reset"), exec.Sudo(h)) c, _ := semver.NewConstraint("<= 1.22.3+k0s.0") running, _ := semver.NewVersion(h.Metadata.K0sBinaryVersion) - if err != nil { - log.Warnf("%s: k0s reported failure: %v", h, err) + if rErr != nil { + log.Warnf("%s: k0s reported failure: %v", h, rErr) if c.Check(running) && strings.Contains(out, "k0s cleanup operations done") { return nil } @@ -80,6 +80,6 @@ func (p *Reset) Run() error { log.Warnf("%s: failed to remove existing configuration %s: %s", h, h.Configurer.K0sConfigPath(), err) } - return nil + return rErr }) } From 0264e7d2f65602f8ca1f8984aa85edc98f4ad115 Mon Sep 17 00:00:00 2001 From: Kimmo Lehto Date: Mon, 7 Mar 2022 13:33:24 +0200 Subject: [PATCH 3/3] Restructure again --- phase/reset.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/phase/reset.go b/phase/reset.go index b5cc2336..c75e429f 100644 --- a/phase/reset.go +++ b/phase/reset.go @@ -66,20 +66,21 @@ func (p *Reset) Run() error { } log.Infof("%s: running k0s reset", h) - out, rErr := h.ExecOutput(h.Configurer.K0sCmdf("reset"), exec.Sudo(h)) + out, err := h.ExecOutput(h.Configurer.K0sCmdf("reset"), exec.Sudo(h)) c, _ := semver.NewConstraint("<= 1.22.3+k0s.0") running, _ := semver.NewVersion(h.Metadata.K0sBinaryVersion) - if rErr != nil { - log.Warnf("%s: k0s reported failure: %v", h, rErr) + + if dErr := h.Configurer.DeleteFile(h, h.Configurer.K0sConfigPath()); dErr != nil { + log.Warnf("%s: failed to remove existing configuration %s: %s", h, h.Configurer.K0sConfigPath(), dErr) + } + + if err != nil { + log.Warnf("%s: k0s reported failure: %v", h, err) if c.Check(running) && strings.Contains(out, "k0s cleanup operations done") { return nil } } - if err := h.Configurer.DeleteFile(h, h.Configurer.K0sConfigPath()); err != nil { - log.Warnf("%s: failed to remove existing configuration %s: %s", h, h.Configurer.K0sConfigPath(), err) - } - - return rErr + return err }) }