diff --git a/cmd/cli/cmd/migrate.go b/cmd/cli/cmd/migrate.go index 0f3ef9e4d7..94c2d664a9 100644 --- a/cmd/cli/cmd/migrate.go +++ b/cmd/cli/cmd/migrate.go @@ -149,7 +149,6 @@ func NewMigrate() *cobra.Command { flags.StringVar(&opts.ConfigExporter.Tag, "cfg-exporter-image-tag", DefaultImageTag, "Config Exporter job image tag") flags.DurationVar(&opts.ConfigExporter.PollPeriod, "cfg-exporter-poll-period", 1*time.Second, "Config Exporter job poll period") flags.DurationVar(&opts.ConfigExporter.Timeout, "cfg-exporter-timeout", 1*time.Minute, "Config Exporter job timeout") - flags.BoolVarP(&opts.Debug, "debug", "d", false, "Turn on debug logging") return login } diff --git a/cmd/cli/docs/botkube_migrate.md b/cmd/cli/docs/botkube_migrate.md index 9e36b65153..d1bf193557 100644 --- a/cmd/cli/docs/botkube_migrate.md +++ b/cmd/cli/docs/botkube_migrate.md @@ -43,7 +43,6 @@ botkube migrate [OPTIONS] [flags] --cfg-exporter-timeout duration Config Exporter job timeout (default 1m0s) --cloud-api-url string Botkube Cloud API URL (default "https://api.botkube.io/graphql") --cloud-dashboard-url string Botkube Cloud URL (default "https://app.botkube.io") - -d, --debug Turn on debug logging -h, --help help for migrate --instance-name string Botkube Cloud Instance name that will be created -l, --label string Label of Botkube pod (default "app=botkube") diff --git a/cmd/cli/docs/botkube_version.md b/cmd/cli/docs/botkube_version.md index 03e8c94634..1611c4a9ed 100644 --- a/cmd/cli/docs/botkube_version.md +++ b/cmd/cli/docs/botkube_version.md @@ -28,7 +28,13 @@ botkube version -o=short -o, --output string Output format. One of: json | pretty | short | yaml (default "pretty") ``` +### Options inherited from parent commands + +``` + -v, --verbose int/string[=simple] Prints more verbose output. Allowed values: 0 - disable, 1 - simple, 2 - trace (default 0 - disable) +``` + ### SEE ALSO -* [botkube](botkube.md) - Botkube Cloud CLI +* [botkube](botkube.md) - Botkube CLI diff --git a/internal/cli/migrate/migrate.go b/internal/cli/migrate/migrate.go index 8bd144ce63..63281a0ace 100644 --- a/internal/cli/migrate/migrate.go +++ b/internal/cli/migrate/migrate.go @@ -20,6 +20,7 @@ import ( "k8s.io/client-go/tools/clientcmd" cliconfig "github.com/kubeshop/botkube/cmd/cli/cmd/config" + "github.com/kubeshop/botkube/internal/cli" "github.com/kubeshop/botkube/internal/cli/printer" "github.com/kubeshop/botkube/internal/ptr" gqlModel "github.com/kubeshop/botkube/internal/remote/graphql" @@ -297,7 +298,7 @@ func waitForMigrationJob(ctx context.Context, k8sCli *kubernetes.Clientset, opts errMsg := fmt.Sprintf("migration job failed: %s", context.Canceled.Error()) - if opts.Debug && job != nil { + if cli.VerboseMode.IsEnabled() && job != nil { errMsg = fmt.Sprintf("%s\n\nDEBUG:\njob:\n\n%s", errMsg, job.String()) } diff --git a/internal/cli/migrate/opts.go b/internal/cli/migrate/opts.go index efe3aebb44..d6240b31f6 100644 --- a/internal/cli/migrate/opts.go +++ b/internal/cli/migrate/opts.go @@ -4,7 +4,6 @@ import "time" // Options holds migrate possible configuration options. type Options struct { - Debug bool Token string InstanceName string `survey:"instanceName"` CloudDashboardURL string