Skip to content

Commit

Permalink
Captures helm error before trying to call WaitForReadyLoftPod
Browse files Browse the repository at this point in the history
(cherry picked from commit b3a6b37)
  • Loading branch information
zerbitx committed Sep 19, 2024
1 parent 2e1dff9 commit 0924d17
Showing 1 changed file with 11 additions and 18 deletions.
29 changes: 11 additions & 18 deletions cmd/vclusterctl/cmd/platform/add/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package add
import (
"cmp"
"context"
"errors"
"fmt"
"os"
"os/exec"
Expand Down Expand Up @@ -237,28 +236,22 @@ func (cmd *ClusterCmd) Run(ctx context.Context, args []string) error {
return fmt.Errorf("create kube client: %w", err)
}

errChan := make(chan error)
helmCmd := exec.CommandContext(ctx, "helm", helmArgs...)

go func() {
helmCmd := exec.CommandContext(ctx, "helm", helmArgs...)
helmCmd.Stdout = cmd.Log.Writer(logrus.DebugLevel, true)
helmCmd.Stderr = cmd.Log.Writer(logrus.DebugLevel, true)
helmCmd.Stdin = os.Stdin

helmCmd.Stdout = cmd.Log.Writer(logrus.DebugLevel, true)
helmCmd.Stderr = cmd.Log.Writer(logrus.DebugLevel, true)
helmCmd.Stdin = os.Stdin
cmd.Log.Info("Installing Loft agent...")
cmd.Log.Debugf("Running helm command: %v", helmCmd.Args)

cmd.Log.Info("Installing Loft agent...")
cmd.Log.Debugf("Running helm command: %v", helmCmd.Args)

err = helmCmd.Run()
if err != nil {
errChan <- fmt.Errorf("failed to install loft chart: %w", err)
}

close(errChan)
}()
err = helmCmd.Run()
if err != nil {
return fmt.Errorf("failed to install loft chart: %w", err)
}

_, err = clihelper.WaitForReadyLoftPod(ctx, clientset, namespace, cmd.Log)
if err = errors.Join(err, <-errChan); err != nil {
if err != nil {
return fmt.Errorf("wait for loft pod: %w", err)
}

Expand Down

0 comments on commit 0924d17

Please sign in to comment.