fixes #2459 #2458 #2454 #2435

derailed · Jan 10, 2024 · 6b6bbcc · 6b6bbcc
1 parent 341f331
commit 6b6bbcc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/internal/config/alias.go b/internal/config/alias.go
@@ -190,5 +190,6 @@ func (a *Aliases) SaveAliases(path string) error {
 	if err != nil {
 		return err
 	}
-	return os.WriteFile(path, cfg, 0644)
+
+	return os.WriteFile(path, cfg, data.DefaultFileMod)
 }
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -77,7 +77,7 @@ func (c *Config) Refine(flags *genericclioptions.ConfigFlags, k9sFlags *Flags, c
 		}
 		_, err = c.K9s.ActivateContext(n)
 		if err != nil {
-			return fmt.Errorf("unable to activate context %q: %w", *flags.Context, err)
+			return fmt.Errorf("unable to activate context %q: %w", n, err)
 		}
 	}
 	log.Debug().Msgf("Active Context %q", c.K9s.ActiveContextName())
@@ -149,6 +149,10 @@ func (c *Config) FavNamespaces() []string {
 
 // SetActiveNamespace set the active namespace in the current context.
 func (c *Config) SetActiveNamespace(ns string) error {
+	if ns == client.NotNamespaced {
+		log.Debug().Msgf("[SetNS] No namespace given. skipping!")
+		return nil
+	}
 	ct, err := c.K9s.ActiveContext()
 	if err != nil {
 		return err
@@ -251,7 +255,7 @@ func (c *Config) SaveFile(path string) error {
 		return err
 	}
 
-	return os.WriteFile(path, cfg, 0644)
+	return os.WriteFile(path, cfg, data.DefaultFileMod)
 }
 
 // Validate the configuration.

diff --git a/internal/config/data/config.go b/internal/config/data/config.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"sync"
 
 	"github.com/derailed/k9s/internal/client"
 	"gopkg.in/yaml.v2"
@@ -16,6 +17,7 @@ import (
 // Config tracks a context configuration.
 type Config struct {
 	Context *Context `yaml:"k9s"`
+	mx      sync.RWMutex
 }
 
 // NewConfig returns a new config.
@@ -27,6 +29,9 @@ func NewConfig(ct *api.Context) *Config {
 
 // Validate ensures config is in norms.
 func (c *Config) Validate(conn client.Connection, ks KubeSettings) {
+	c.mx.Lock()
+	defer c.mx.Unlock()
+
 	if c.Context == nil {
 		c.Context = NewContext()
 	}
@@ -42,6 +47,9 @@ func (c *Config) Dump(w io.Writer) {
 
 // Save saves the config to disk.
 func (c *Config) Save(path string) error {
+	c.mx.RLock()
+	defer c.mx.RUnlock()
+
 	if err := EnsureDirPath(path, DefaultDirMod); err != nil {
 		return err
 	}

diff --git a/internal/config/k9s.go b/internal/config/k9s.go
@@ -191,15 +191,12 @@ func (k *K9s) ActivateContext(n string) (*data.Context, error) {
 	// If the context specifies a namespace, use it!
 	if ns := ct.Namespace; ns != client.BlankNamespace {
 		k.activeConfig.Context.Namespace.Active = ns
-	} else {
+	} else if k.activeConfig.Context.Namespace.Active == "" {
 		k.activeConfig.Context.Namespace.Active = client.DefaultNamespace
 	}
 	if k.activeConfig.Context == nil {
 		return nil, fmt.Errorf("context activation failed for: %s", n)
 	}
-	if k.activeConfig.Context == nil {
-		return nil, fmt.Errorf("context activation failed for: %s", n)
-	}
 
 	return k.activeConfig.Context, nil
 }