Remove namespace flag

percona · Feb 28, 2024 · 66ce00b · 66ce00b
1 parent 9eeb4b9
commit 66ce00b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/commands/upgrade.go b/commands/upgrade.go
@@ -72,7 +72,6 @@ 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("namespace", "everest-system", "Namespace where Everest is installed")
 	cmd.Flags().String("version-metadata-url", "https://check.percona.com", "URL to retrieve version metadata information from")
 }
 
@@ -81,7 +80,6 @@ func initUpgradeViperFlags(cmd *cobra.Command) {
 	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("namespace", cmd.Flags().Lookup("namespace"))                       //nolint:errcheck,gosec
 	viper.BindPFlag("version-metadata-url", cmd.Flags().Lookup("version-metadata-url")) //nolint:errcheck,gosec
 }
 

diff --git a/pkg/upgrade/upgrade.go b/pkg/upgrade/upgrade.go
@@ -27,6 +27,7 @@ import (
 	"go.uber.org/zap"
 	"k8s.io/apimachinery/pkg/types"
 
+	"github.com/percona/percona-everest-cli/pkg/install"
 	"github.com/percona/percona-everest-cli/pkg/kubernetes"
 	cliVersion "github.com/percona/percona-everest-cli/pkg/version"
 )
@@ -43,8 +44,6 @@ type (
 
 		// KubeconfigPath is a path to a kubeconfig
 		KubeconfigPath string `mapstructure:"kubeconfig"`
-		// Namespace holds namespace where Everest is installed.
-		Namespace string
 		// VersionMetadataURL stores hostname to retrieve version metadata information from.
 		VersionMetadataURL string `mapstructure:"version-metadata-url"`
 	}
@@ -112,8 +111,8 @@ func (u *Upgrade) Run(ctx context.Context) error {
 		return err
 	}
 
-	u.l.Infof("Upgrading Everest to %s in namespace %s", upgradeEverestTo, u.config.Namespace)
-	if err := u.kubeClient.InstallEverest(ctx, u.config.Namespace, upgradeEverestTo); err != nil {
+	u.l.Infof("Upgrading Everest to %s in namespace %s", upgradeEverestTo, install.SystemNamespace)
+	if err := u.kubeClient.InstallEverest(ctx, install.SystemNamespace, upgradeEverestTo); err != nil {
 		return err
 	}