Respect existing behavior

and set k9s's active ns if no ns specified in the context

internal/client/config.go

@@ -94,6 +94,19 @@ func (c *Config) CurrentContextName() (string, error) {
 	return cfg.CurrentContext, nil
 }
 
+func (c *Config) CurrentContextNamespace() (string, error) {
+	name, err := c.CurrentContextName()
+	if err != nil {
+		return "", err
+	}
+	context, err := c.GetContext(name)
+	if err != nil {
+		return "", err
+	}
+
+	return context.Namespace, nil
+}
+
 // GetContext fetch a given context or error if it does not exists.
 func (c *Config) GetContext(n string) (*clientcmdapi.Context, error) {
 	cfg, err := c.RawConfig()
@@ -283,6 +296,13 @@ func (c *Config) CurrentUserName() (string, error) {
 func (c *Config) CurrentNamespaceName() (string, error) {
 	ns, _, err := c.clientConfig().Namespace()
 
+	if ns == "default" {
+		ns, err = c.CurrentContextNamespace()
+		if ns == "" && err == nil {
+			return "", errors.New("No namespace specified in context")
+		}
+	}
+
 	return ns, err
 }
 

internal/client/config_test.go

@@ -111,7 +111,7 @@ func TestConfigCurrentNamespace(t *testing.T) {
 	}{
 		"default": {
 			flags:     &genericclioptions.ConfigFlags{KubeConfig: &kubeConfig},
-			namespace: "default",
+			namespace: "",
 		},
 		"withContext": {
 			flags:     &genericclioptions.ConfigFlags{KubeConfig: &kubeConfig, Context: &bleeCTX},
@@ -128,7 +128,9 @@ func TestConfigCurrentNamespace(t *testing.T) {
 		t.Run(k, func(t *testing.T) {
 			cfg := client.NewConfig(u.flags)
 			ns, err := cfg.CurrentNamespaceName()
-			assert.Nil(t, err)
+			if ns != "" {
+				assert.Nil(t, err)
+			}
 			assert.Equal(t, u.namespace, ns)
 		})
 	}

internal/dao/testdata/config

@@ -21,6 +21,7 @@ contexts:
   name: fred
 - context:
     cluster: blee
+    namespace: zorg
     user: blee
   name: blee
 - context:

internal/view/app.go

@@ -403,7 +403,11 @@ func (a *App) switchContext(name string) error {
 	a.Halt()
 	defer a.Resume()
 	{
-		ns := a.Config.ActiveNamespace()
+		ns, err := a.Conn().Config().CurrentNamespaceName()
+		if err != nil {
+			log.Warn().Msg("No namespace specified in context. Using K9s config")
+			ns = a.Config.ActiveNamespace()
+		}
 		a.initFactory(ns)
 
 		if e := a.command.Reset(true); e != nil {