fix: better cleanup on failed install (#35)

weka · Jan 3, 2024 · 9979fc1 · 9979fc1
1 parent c7a71f9
commit 9979fc1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/internal/cli/local/setup/run.go b/internal/cli/local/setup/run.go
@@ -17,7 +17,7 @@ import (
 
 var logger = utils.GetLogger("setup")
 
-func runSetup(cmd *cobra.Command, args []string) error {
+func runSetup(cmd *cobra.Command, args []string) (err error) {
 	if setupConfig.BundlePath != bundle.BundlePath() {
 		if err := bundle.SetBundlePath(setupConfig.BundlePath); err != nil {
 			return err
@@ -33,7 +33,14 @@ func runSetup(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
-	err := k3s.Install(cmd.Context(), k3s.InstallConfig{
+	// cleanup on any error during installing
+	defer func() {
+		if err != nil && !errors.Is(err, k3s.ErrExists) {
+			k3s.Cleanup(setupConfig.Debug)
+		}
+	}()
+
+	err = k3s.Install(cmd.Context(), k3s.InstallConfig{
 		Configuration: setupConfig.Configuration,
 		Iface:         setupConfig.Iface,
 		Debug:         setupConfig.Debug,

diff --git a/internal/local/chart/install.go b/internal/local/chart/install.go
@@ -2,7 +2,6 @@ package chart
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
 	helmclient "github.com/mittwald/go-helm-client"
@@ -52,10 +51,6 @@ func Install(ctx context.Context, opts *HelmOptions) error {
 
 	release, err := client.InstallChart(ctx, spec, nil)
 	if err != nil {
-		if errors.Is(err, context.Canceled) {
-			logger.Info().Msg("Chart installation was cancelled")
-			return nil
-		}
 		return fmt.Errorf("failed installing chart: %w", err)
 	}
 

diff --git a/internal/local/k3s/install.go b/internal/local/k3s/install.go
@@ -71,26 +71,22 @@ func Install(ctx context.Context, c InstallConfig) error {
 	if err != nil {
 		if errors.Is(err, context.Canceled) {
 			logger.Info().Msg("Setup was cancelled")
-			cleanup(false)
 			return nil
 		}
-
-		cleanup(c.Debug)
 		return err
 	}
 
 	err = setupTLS(ctx, TLSConfig{CertFile: c.TLS.Cert, KeyFile: c.TLS.Key})
 	if err != nil && !errors.Is(err, ErrNoTLS) {
-		cleanup(c.Debug)
 		return err
 	}
 
 	return nil
 }
 
-// cleanup runs k3s-uninstall and removes copied files
+// Cleanup runs k3s-uninstall and removes copied files
 // if debug flag is not enabled
-func cleanup(debug bool) {
+func Cleanup(debug bool) {
 	if !debug {
 		logger.Info().Msg("Cleaning up installation")