pass params

kubeshop · Aug 17, 2023 · 08b83d4 · 08b83d4
1 parent fb16ffe
commit 08b83d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/internal/cli/migrate/migrate.go b/internal/cli/migrate/migrate.go
@@ -134,6 +134,7 @@ func migrate(ctx context.Context, status *printer.StatusPrinter, opts Options, b
 			continue
 		}
 	}
+	status.End(true)
 
 	if errs.ErrorOrNil() != nil {
 		return "", fmt.Errorf("while migrating aliases: %w%s", errs.ErrorOrNil(), errStateMessage(opts.CloudDashboardURL, mutation.CreateDeployment.ID))
@@ -145,7 +146,7 @@ func migrate(ctx context.Context, status *printer.StatusPrinter, opts Options, b
 	}
 
 	installConfig := install.Config{
-		HelmParams: parseHelmCommand(mutation.CreateDeployment.InstallUpgradeInstructions),
+		HelmParams: parseHelmCommand(mutation.CreateDeployment.InstallUpgradeInstructions, opts.AutoApprove),
 		Watch:      opts.Watch,
 		Timeout:    opts.Timeout,
 	}
@@ -294,7 +295,7 @@ func waitForMigrationJob(ctx context.Context, k8sCli *kubernetes.Clientset, opts
 	}
 }
 
-func parseHelmCommand(instructions []*gqlModel.InstallUpgradeInstructionsForPlatform) helm.Config {
+func parseHelmCommand(instructions []*gqlModel.InstallUpgradeInstructionsForPlatform, autoApprove bool) helm.Config {
 	// platform := runtime.GOOS
 	var raw string
 	if len(instructions) > 1 {
@@ -320,6 +321,7 @@ func parseHelmCommand(instructions []*gqlModel.InstallUpgradeInstructionsForPlat
 		ReleaseName:  helm.ReleaseName,
 		ChartName:    helm.HelmChartName,
 		RepoLocation: helm.HelmRepoStable,
+		AutoApprove:  autoApprove,
 	}
 }
 

diff --git a/internal/cli/migrate/opts.go b/internal/cli/migrate/opts.go
@@ -2,13 +2,12 @@ package migrate
 
 import (
 	"time"
-
-	"github.com/kubeshop/botkube/internal/cli/install/helm"
 )
 
 // Options holds migrate possible configuration options.
 type Options struct {
 	Timeout           time.Duration
+	Watch             bool
 	Token             string
 	InstanceName      string `survey:"instanceName"`
 	CloudDashboardURL string
@@ -19,8 +18,6 @@ type Options struct {
 	SkipOpenBrowser   bool
 	AutoApprove       bool
 	ConfigExporter    ConfigExporterOptions
-	HelmParams        helm.Config
-	Watch             bool
 }
 
 // ConfigExporterOptions holds config exporter image configuration options.