feat: reintroduce --switch-context

FabianKramm · FabianKramm · commit 14f80a072b79 · 2022-03-15T11:11:52.000+01:00
diff --git a/cmd/analyze.go b/cmd/analyze.go
@@ -86,7 +86,7 @@ func (cmd *AnalyzeCmd) RunAnalyze(f factory.Factory, cobraCmd *cobra.Command, ar
 
 	// If the current kube context or namespace is different than old,
 	// show warnings and reset kube client if necessary
-	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, log)
+	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, log)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/deploy.go b/cmd/deploy.go
@@ -213,7 +213,7 @@ func prepare(ctx context.Context, f factory.Factory, configOptions *loader.Confi
 
 	// If the current kube context or namespace is different than old,
 	// show warnings and reset kube client if necessary
-	client, err = kubectl.CheckKubeContext(client, localCache, globalFlags.NoWarn, log)
+	client, err = kubectl.CheckKubeContext(client, localCache, globalFlags.NoWarn, globalFlags.SwitchContext, log)
 	if err != nil {
 		return nil, err
 	}
diff --git a/cmd/flags/flags.go b/cmd/flags/flags.go
@@ -17,6 +17,7 @@ type GlobalFlags struct {
 	Profiles                 []string
 	ProfileRefresh           bool
 	DisableProfileActivation bool
+	SwitchContext            bool
 	ConfigPath               string
 	Vars                     []string
 
@@ -54,6 +55,7 @@ func SetGlobalFlags(flags *flag.FlagSet) *GlobalFlags {
 	flags.StringSliceVarP(&globalFlags.Profiles, "profile", "p", []string{}, "The DevSpace profiles to apply. Multiple profiles are applied in the order they are specified")
 	flags.BoolVar(&globalFlags.ProfileRefresh, "profile-refresh", false, "If true will pull and re-download profile parent sources")
 	flags.BoolVar(&globalFlags.DisableProfileActivation, "disable-profile-activation", false, "If true will ignore all profile activations")
+	flags.BoolVarP(&globalFlags.SwitchContext, "switch-context", "s", false, "Switches and uses the last kube context and namespace that was used to deploy the DevSpace project")
 	flags.StringVarP(&globalFlags.Namespace, "namespace", "n", "", "The kubernetes namespace to use")
 	flags.StringVar(&globalFlags.KubeContext, "kube-context", "", "The kubernetes context to use")
 	flags.StringSliceVar(&globalFlags.Vars, "var", []string{}, "Variables to override during execution (e.g. --var=MYVAR=MYVALUE)")
diff --git a/cmd/list/deployments.go b/cmd/list/deployments.go
@@ -80,7 +80,7 @@ func (cmd *deploymentsCmd) RunDeploymentsStatus(f factory.Factory, cobraCmd *cob
 
 	// If the current kube context or namespace is different than old,
 	// show warnings and reset kube client if necessary
-	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, logger)
+	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, logger)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/list/namespaces.go b/cmd/list/namespaces.go
@@ -71,7 +71,7 @@ func (cmd *namespacesCmd) RunListNamespaces(f factory.Factory, cobraCmd *cobra.C
 
 	// If the current kube context or namespace is different than old,
 	// show warnings and reset kube client if necessary
-	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, logger)
+	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, logger)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/open.go b/cmd/open.go
@@ -129,7 +129,7 @@ func (cmd *OpenCmd) RunOpen(f factory.Factory) error {
 
 	// If the current kube context or namespace is different than old,
 	// show warnings and reset kube client if necessary
-	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.log)
+	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, cmd.log)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/reset/pods.go b/cmd/reset/pods.go
@@ -78,7 +78,7 @@ func (cmd *podsCmd) RunResetPods(f factory.Factory, cobraCmd *cobra.Command, arg
 
 	// If the current kube context or namespace is different than old,
 	// show warnings and reset kube client if necessary
-	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.log)
+	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, cmd.log)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/restart.go b/cmd/restart.go
@@ -108,7 +108,7 @@ func (cmd *RestartCmd) Run(f factory.Factory) error {
 
 	// If the current kube context or namespace is different than old,
 	// show warnings and reset kube client if necessary
-	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.log)
+	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, cmd.log)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/sync.go b/cmd/sync.go
@@ -163,7 +163,7 @@ func (cmd *SyncCmd) Run(f factory.Factory) error {
 
 	// If the current kube context or namespace is different than old,
 	// show warnings and reset kube client if necessary
-	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, logger)
+	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, logger)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/ui.go b/cmd/ui.go
@@ -156,7 +156,7 @@ func (cmd *UICmd) RunUI(f factory.Factory) error {
 
 	// If the current kube context or namespace is different than old,
 	// show warnings and reset kube client if necessary
-	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.log)
+	client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, cmd.log)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/devspace/kubectl/client.go b/pkg/devspace/kubectl/client.go
@@ -184,14 +184,14 @@ func (client *client) IsInCluster() bool {
 }
 
 // CheckKubeContext prints a warning if the last kube context is different than this one
-func CheckKubeContext(client Client, localCache localcache.Cache, noWarning bool, log log.Logger) (Client, error) {
+func CheckKubeContext(client Client, localCache localcache.Cache, noWarning, autoSwitch bool, log log.Logger) (Client, error) {
 	currentConfigContext := &localcache.LastContextConfig{
 		Namespace: client.Namespace(),
 		Context:   client.CurrentContext(),
 	}
 
 	resetClient := false
-	if localCache != nil && log.GetLevel() >= logrus.InfoLevel && !noWarning {
+	if localCache != nil && !noWarning {
 		lastConfigContext := localCache.GetLastContext()
 
 		// print warning if context or namespace has changed since last deployment process (expect if explicitly provided as flags)
@@ -202,64 +202,75 @@ func CheckKubeContext(client Client, localCache localcache.Cache, noWarning bool
 			// then ask which namespace to use
 			if lastConfigContext.Context != "" &&
 				lastConfigContext.Context != currentConfigContext.Context {
-				log.WriteString(logrus.InfoLevel, "\n")
-				log.Warnf(ansi.Color("Are you using the correct kube context?", "white+b"))
-				log.Warnf("Current kube context: '%s'", ansi.Color(currentConfigContext.Context, "white+b"))
-				log.Warnf("Last    kube context: '%s'", ansi.Color(lastConfigContext.Context, "white+b"))
-
-				// if terminal is not interactive then return the same client
-				if !isTerminalIn {
-					return client, nil
-				}
-
-				kc, err := log.Question(&survey.QuestionOptions{
-					Question:     "Which context do you want to use?",
-					DefaultValue: currentConfigContext.Context,
-					Options: []string{
-						currentConfigContext.Context,
-						lastConfigContext.Context,
-					},
-				})
-				if err != nil {
-					return client, err
-				}
-				if kc != currentConfigContext.Context {
-					currentConfigContext.Context = kc
+				if autoSwitch {
+					currentConfigContext.Context = lastConfigContext.Context
 					currentConfigContext.Namespace = lastConfigContext.Namespace
 					resetClient = true
+				} else if log.GetLevel() >= logrus.InfoLevel {
+					log.WriteString(logrus.WarnLevel, "\n")
+					log.Warnf(ansi.Color("Are you using the correct kube context?", "white+b"))
+					log.Warnf("Current kube context: '%s'", ansi.Color(currentConfigContext.Context, "white+b"))
+					log.Warnf("Last    kube context: '%s'", ansi.Color(lastConfigContext.Context, "white+b"))
+
+					// if terminal is not interactive then return the same client
+					if !isTerminalIn {
+						return client, nil
+					}
+
+					kc, err := log.Question(&survey.QuestionOptions{
+						Question:     "Which context do you want to use?",
+						DefaultValue: currentConfigContext.Context,
+						Options: []string{
+							currentConfigContext.Context,
+							lastConfigContext.Context,
+						},
+					})
+					if err != nil {
+						return client, err
+					}
+					if kc != currentConfigContext.Context {
+						currentConfigContext.Context = kc
+						currentConfigContext.Namespace = lastConfigContext.Namespace
+						resetClient = true
+					}
 				}
 			} else if lastConfigContext.Namespace != "" &&
 				lastConfigContext.Namespace != currentConfigContext.Namespace {
-				log.WriteString(logrus.InfoLevel, "\n")
-				log.Warnf(ansi.Color("Are you using the correct namespace?", "white+b"))
-				log.Warnf("Current namespace: '%s'", ansi.Color(currentConfigContext.Namespace, "white+b"))
-				log.Warnf("Last    namespace: '%s'", ansi.Color(lastConfigContext.Namespace, "white+b"))
-
-				// if terminal is not interactive then return the same client
-				if !isTerminalIn {
-					return client, nil
-				}
-
-				ns, err := log.Question(&survey.QuestionOptions{
-					Question:     "Which namespace do you want to use?",
-					DefaultValue: currentConfigContext.Namespace,
-					Options: []string{
-						currentConfigContext.Namespace,
-						lastConfigContext.Namespace,
-					},
-				})
-				if err != nil {
-					return client, err
-				}
-				if ns != currentConfigContext.Namespace {
-					currentConfigContext.Namespace = ns
+				if autoSwitch {
+					currentConfigContext.Namespace = lastConfigContext.Namespace
 					resetClient = true
+				} else if log.GetLevel() >= logrus.InfoLevel {
+					log.WriteString(logrus.WarnLevel, "\n")
+					log.Warnf(ansi.Color("Are you using the correct namespace?", "white+b"))
+					log.Warnf("Current namespace: '%s'", ansi.Color(currentConfigContext.Namespace, "white+b"))
+					log.Warnf("Last    namespace: '%s'", ansi.Color(lastConfigContext.Namespace, "white+b"))
+
+					// if terminal is not interactive then return the same client
+					if !isTerminalIn {
+						return client, nil
+					}
+
+					ns, err := log.Question(&survey.QuestionOptions{
+						Question:     "Which namespace do you want to use?",
+						DefaultValue: currentConfigContext.Namespace,
+						Options: []string{
+							currentConfigContext.Namespace,
+							lastConfigContext.Namespace,
+						},
+					})
+					if err != nil {
+						return client, err
+					}
+					if ns != currentConfigContext.Namespace {
+						currentConfigContext.Namespace = ns
+						resetClient = true
+					}
 				}
 			}
 		}
 
 		// Warn if using default namespace unless previous deployment was also to default namespace
-		if currentConfigContext.Namespace == metav1.NamespaceDefault &&
+		if log.GetLevel() >= logrus.InfoLevel && currentConfigContext.Namespace == metav1.NamespaceDefault &&
 			(lastConfigContext == nil ||
 				lastConfigContext.Namespace != metav1.NamespaceDefault) {
 			log.Warn("Deploying into the 'default' namespace is usually not a good idea as this namespace cannot be deleted\n")

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ func (cmd AnalyzeCmd) RunAnalyze(f factory.Factory, cobraCmd cobra.Command, ar`
`86`	`86`
`87`	`87`	`// If the current kube context or namespace is different than old,`
`88`	`88`	`// show warnings and reset kube client if necessary`
`89`		`- client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, log)`
	`89`	`+ client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, log)`
`90`	`90`	`if err != nil {`
`91`	`91`	`return err`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ func prepare(ctx context.Context, f factory.Factory, configOptions *loader.Confi`
`213`	`213`
`214`	`214`	`// If the current kube context or namespace is different than old,`
`215`	`215`	`// show warnings and reset kube client if necessary`
`216`		`- client, err = kubectl.CheckKubeContext(client, localCache, globalFlags.NoWarn, log)`
	`216`	`+ client, err = kubectl.CheckKubeContext(client, localCache, globalFlags.NoWarn, globalFlags.SwitchContext, log)`
`217`	`217`	`if err != nil {`
`218`	`218`	`return nil, err`
`219`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ func (cmd deploymentsCmd) RunDeploymentsStatus(f factory.Factory, cobraCmd cob`
`80`	`80`
`81`	`81`	`// If the current kube context or namespace is different than old,`
`82`	`82`	`// show warnings and reset kube client if necessary`
`83`		`- client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, logger)`
	`83`	`+ client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, logger)`
`84`	`84`	`if err != nil {`
`85`	`85`	`return err`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func (cmd namespacesCmd) RunListNamespaces(f factory.Factory, cobraCmd cobra.C`
`71`	`71`
`72`	`72`	`// If the current kube context or namespace is different than old,`
`73`	`73`	`// show warnings and reset kube client if necessary`
`74`		`- client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, logger)`
	`74`	`+ client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, logger)`
`75`	`75`	`if err != nil {`
`76`	`76`	`return err`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ func (cmd *OpenCmd) RunOpen(f factory.Factory) error {`
`129`	`129`
`130`	`130`	`// If the current kube context or namespace is different than old,`
`131`	`131`	`// show warnings and reset kube client if necessary`
`132`		`- client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.log)`
	`132`	`+ client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, cmd.log)`
`133`	`133`	`if err != nil {`
`134`	`134`	`return err`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func (cmd podsCmd) RunResetPods(f factory.Factory, cobraCmd cobra.Command, arg`
`78`	`78`
`79`	`79`	`// If the current kube context or namespace is different than old,`
`80`	`80`	`// show warnings and reset kube client if necessary`
`81`		`- client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.log)`
	`81`	`+ client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, cmd.log)`
`82`	`82`	`if err != nil {`
`83`	`83`	`return err`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func (cmd *RestartCmd) Run(f factory.Factory) error {`
`108`	`108`
`109`	`109`	`// If the current kube context or namespace is different than old,`
`110`	`110`	`// show warnings and reset kube client if necessary`
`111`		`- client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.log)`
	`111`	`+ client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, cmd.log)`
`112`	`112`	`if err != nil {`
`113`	`113`	`return err`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ func (cmd *SyncCmd) Run(f factory.Factory) error {`
`163`	`163`
`164`	`164`	`// If the current kube context or namespace is different than old,`
`165`	`165`	`// show warnings and reset kube client if necessary`
`166`		`- client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, logger)`
	`166`	`+ client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, logger)`
`167`	`167`	`if err != nil {`
`168`	`168`	`return err`
`169`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ func (cmd *UICmd) RunUI(f factory.Factory) error {`
`156`	`156`
`157`	`157`	`// If the current kube context or namespace is different than old,`
`158`	`158`	`// show warnings and reset kube client if necessary`
`159`		`- client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.log)`
	`159`	`+ client, err = kubectl.CheckKubeContext(client, localCache, cmd.NoWarn, cmd.SwitchContext, cmd.log)`
`160`	`160`	`if err != nil {`
`161`	`161`	`return err`
`162`	`162`	`}`