This repository has been archived by the owner on Mar 4, 2024. It is now read-only.
EVEREST-793: upgrade command #297
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,11 +23,11 @@ import ( | |
| "github.com/spf13/viper" | ||
| "go.uber.org/zap" | ||
|
|
||
| everestClient "github.com/percona/percona-everest-cli/pkg/everest/client" | ||
| "github.com/percona/percona-everest-cli/pkg/output" | ||
| "github.com/percona/percona-everest-cli/pkg/upgrade" | ||
| ) | ||
|
|
||
| func newUpgradeCmd(l *zap.SugaredLogger) *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "upgrade", | ||
recharte marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
@@ -40,12 +40,17 @@ func newUpgradeCmd(l *zap.SugaredLogger) *cobra.Command { | |
| Run: func(cmd *cobra.Command, args []string) { | ||
| initUpgradeViperFlags(cmd) | ||
|
|
||
| c, err := parseUpgradeConfig() | ||
| if err != nil { | ||
| os.Exit(1) | ||
| } | ||
|
|
||
| everestClConnector, err := everestClient.NewEverestFromURL(c.Everest.Endpoint, c.Everest.Token) | ||
| if err != nil { | ||
| l.Error(err) | ||
| os.Exit(1) | ||
| } | ||
| op, err := upgrade.NewUpgrade(c, everestClConnector, l) | ||
| if err != nil { | ||
| l.Error(err) | ||
| os.Exit(1) | ||
|
|
@@ -64,22 +69,22 @@ func newUpgradeCmd(l *zap.SugaredLogger) *cobra.Command { | |
| } | ||
|
|
||
| func initUpgradeFlags(cmd *cobra.Command) { | ||
| cmd.Flags().String("everest.endpoint", "http://127.0.0.1:8080", "Everest endpoint URL") | ||
| cmd.Flags().String("everest.token", "", "Everest token to authenticate against Everest") | ||
| cmd.Flags().StringP("kubeconfig", "k", "~/.kube/config", "Path to a kubeconfig") | ||
| cmd.Flags().String("version-metadata-url", "https://check.percona.com", "URL to retrieve version metadata information from") | ||
| } | ||
|
|
||
| func initUpgradeViperFlags(cmd *cobra.Command) { | ||
| viper.BindPFlag("everest.endpoint", cmd.Flags().Lookup("everest.endpoint")) //nolint:errcheck,gosec | ||
| viper.BindPFlag("everest.token", cmd.Flags().Lookup("everest.token")) //nolint:errcheck,gosec | ||
| viper.BindEnv("kubeconfig") //nolint:errcheck,gosec | ||
| viper.BindPFlag("kubeconfig", cmd.Flags().Lookup("kubeconfig")) //nolint:errcheck,gosec | ||
| viper.BindPFlag("version-metadata-url", cmd.Flags().Lookup("version-metadata-url")) //nolint:errcheck,gosec | ||
| } | ||
|
|
||
| func parseUpgradeConfig() (*upgrade.UpgradeConfig, error) { | ||
| c := &upgrade.UpgradeConfig{} | ||
|
Comment on lines
-81
to
+87
There was a problem hiding this comment. will there config types other than the There was a problem hiding this comment. Yes, there could be, as we have with other commands. |
||
| err := viper.Unmarshal(c) | ||
| return c, err | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,6 +22,3 @@ import "embed" | |
| // | ||
| //go:embed crds/* | ||
| var OLMCRDs embed.FS | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm thinking if we really need this as a cli flag. It's not something the end user would want to configure. Should we have it in build flags then?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The purpose of this flag is to enable: