Capture error output of k0s reset (#809)

Signed-off-by: Kimmo Lehto <[email protected]>
k0sproject · Dec 13, 2024 · ebf4911 · ebf4911
1 parent 91f766e
commit ebf4911
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/phase/reset_controllers.go b/phase/reset_controllers.go
@@ -1,7 +1,9 @@
 package phase
 
 import (
+	"bytes"
 	"context"
+	"fmt"
 
 	"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1"
 	"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
@@ -97,10 +99,13 @@ func (p *ResetControllers) Run() error {
 		}
 
 		log.Debugf("%s: resetting k0s...", h)
-		out, err := h.ExecOutput(h.Configurer.K0sCmdf("reset --data-dir=%s", h.K0sDataDir()), exec.Sudo(h))
+		var stdoutbuf, stderrbuf bytes.Buffer
+		cmd, err := h.ExecStreams(h.Configurer.K0sCmdf("reset --data-dir=%s", h.K0sDataDir()), nil, &stdoutbuf, &stderrbuf, exec.Sudo(h))
 		if err != nil {
-			log.Debugf("%s: k0s reset failed: %s", h, out)
-			log.Warnf("%s: k0s reported failure: %v", h, err)
+			return fmt.Errorf("failed to run k0s reset: %w", err)
+		}
+		if err := cmd.Wait(); err != nil {
+			log.Warnf("%s: k0s reset reported failure: %s %s", h, stderrbuf.String(), stdoutbuf.String())
 		}
 		log.Debugf("%s: resetting k0s completed", h)
 

diff --git a/phase/reset_workers.go b/phase/reset_workers.go
@@ -1,7 +1,9 @@
 package phase
 
 import (
+	"bytes"
 	"context"
+	"fmt"
 
 	"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1"
 	"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
@@ -87,10 +89,13 @@ func (p *ResetWorkers) Run() error {
 		}
 
 		log.Debugf("%s: resetting k0s...", h)
-		out, err := h.ExecOutput(h.Configurer.K0sCmdf("reset --data-dir=%s", h.K0sDataDir()), exec.Sudo(h))
+		var stdoutbuf, stderrbuf bytes.Buffer
+		cmd, err := h.ExecStreams(h.Configurer.K0sCmdf("reset --data-dir=%s", h.K0sDataDir()), nil, &stdoutbuf, &stderrbuf, exec.Sudo(h))
 		if err != nil {
-			log.Debugf("%s: k0s reset failed: %s", h, out)
-			log.Warnf("%s: k0s reported failure: %v", h, err)
+			return fmt.Errorf("failed to run k0s reset: %w", err)
+		}
+		if err := cmd.Wait(); err != nil {
+			log.Warnf("%s: k0s reset reported failure: %s %s", h, stderrbuf.String(), stdoutbuf.String())
 		}
 		log.Debugf("%s: resetting k0s completed", h)
 
@@ -99,14 +104,14 @@ func (p *ResetWorkers) Run() error {
 			log.Warnf("%s: failed to remove existing configuration %s: %s", h, h.Configurer.K0sConfigPath(), dErr)
 		}
 		log.Debugf("%s: removing config completed", h)
-		
+
 		if len(h.Environment) > 0 {
 			if err := h.Configurer.CleanupServiceEnvironment(h, h.K0sServiceName()); err != nil {
 				log.Warnf("%s: failed to clean up service environment: %s", h, err.Error())
 			}
 		}
 
 		log.Infof("%s: reset", h)
-		return err
+		return nil
 	})
 }