Rel v0.50.3 (#3276)

* update linter

* spring cleaning

- m'o code cleanup
- small bugs fixin

* fix cust col jq parser support

* add context,token to shell args

* rel notes

Author: derailed

.github/workflows/lint.yml

@@ -20,5 +20,5 @@ jobs:
       - name: Lint
         uses: golangci/[email protected]
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          reporter: github-pr-check
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          version: v2.1.1

.golangci.yml

@@ -41,9 +41,6 @@ linters:
     - goconst
     - dogsled
     - lll
-    # - dupl
-    # - gochecknoinits
-    # - mnd
 
   settings:
     dogsled:
@@ -96,20 +93,24 @@ linters:
     goconst:
       min-len: 2
       min-occurrences: 3
-      ignore-strings: 'blee|duh|cl-1|ct-1-1'
-
-    # gocritic:
-    #   enabled-tags:
-    #     - diagnostic
-    #     - experimental
-    #     - opinionated
-    #     - performance
-    #     - style
-    #   disabled-checks:
-    #     - dupImport # https://github.com/go-critic/go-critic/issues/845
-    #     - ifElseChain
-    #     - octalLiteral
-    #     - whyNoLint
+      ignore-string-values:
+        - blee
+        - duh
+        - cl-1
+        - ct-1-1
+
+    gocritic:
+      enabled-tags:
+        - diagnostic
+        - experimental
+        - opinionated
+        - performance
+        - style
+      disabled-checks:
+        - dupImport # https://github.com/go-critic/go-critic/issues/845
+        - ifElseChain
+        - octalLiteral
+        - whyNoLint
 
     gocyclo:
       min-complexity: 35

Makefile

@@ -11,7 +11,7 @@ DATE       ?= $(shell TZ=UTC date -j -f "%s" ${SOURCE_DATE_EPOCH} +"%Y-%m-%dT%H:
 else
 DATE       ?= $(shell date -u -d @${SOURCE_DATE_EPOCH} +"%Y-%m-%dT%H:%M:%SZ")
 endif
-VERSION    ?= v0.50.2
+VERSION    ?= v0.50.3
 IMG_NAME   := derailed/k9s
 IMAGE      := ${IMG_NAME}:${VERSION}
 

change_logs/release_v0.50.3.md

@@ -0,0 +1,38 @@
+<img src="https://raw.githubusercontent.com/derailed/k9s/master/assets/k9s.png" align="center" width="800" height="auto"/>
+
+# Release v0.50.3
+
+## Notes
+
+Thank you to all that contributed with flushing out issues and enhancements for K9s!
+I'll try to mark some of these issues as fixed. But if you don't mind grab the latest rev
+and see if we're happier with some of the fixes!
+If you've filed an issue please help me verify and close.
+
+Your support, kindness and awesome suggestions to make K9s better are, as ever, very much noted and appreciated!
+Also big thanks to all that have allocated their own time to help others on both slack and on this repo!!
+
+As you may know, K9s is not pimped out by corps with deep pockets, thus if you feel K9s is helping your Kubernetes journey,
+please consider joining our [sponsorship program](https://github.com/sponsors/derailed) and/or make some noise on social! [@kitesurfer](https://twitter.com/kitesurfer)
+
+On Slack? Please join us [K9slackers](https://join.slack.com/t/k9sers/shared_invite/zt-3360a389v-ElLHrb0Dp1kAXqYUItSAFA)
+
+## Maintenance Release!
+
+A bit more code spring cleaning/TLC and address a few bugs:
+
+1. [RBAC View] Fix issue bombing out on RBAC cluster roles
+2. [Custom Views] Fix issue with parsing `jq` filters and bombing out (Big Thanks to Pierre for flagging it!)
+
+---
+
+## Contributed PRs
+
+Please be sure to give `Big Thanks!` and `ATTA Girls/Boys!` to all the fine contributors for making K9s better for all of us!!
+
+* [#3273](https://github.com/derailed/k9s/pull/3273) k9s plugin scopes containers issue
+* [#3169](https://github.com/derailed/k9s/pull/3169) feat: pass context and token flags to kubectl exec commands
+
+
+---
+<img src="https://raw.githubusercontent.com/derailed/k9s/master/assets/imhotep_logo.png" width="32" height="auto"/> © 2025 Imhotep Software LLC. All materials licensed under [Apache v2.0](http://www.apache.org/licenses/LICENSE-2.0)

internal/client/gvr.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/derailed/k9s/internal/slogs"
 	"github.com/fvbommel/sortorder"
+	"gopkg.in/yaml.v3"
 	apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -43,9 +44,9 @@ func (c gvrCache) get(gvrs string) *GVR {
 var gvrsCache = make(gvrCache)
 
 // NewGVR builds a new gvr from a group, version, resource.
-func NewGVR(path string) *GVR {
-	raw := path
-	tokens := strings.Split(path, ":")
+func NewGVR(s string) *GVR {
+	raw := s
+	tokens := strings.Split(s, ":")
 	var g, v, r, sr string
 	if len(tokens) == 2 {
 		raw, sr = tokens[0], tokens[1]
@@ -59,10 +60,10 @@ func NewGVR(path string) *GVR {
 	case 1:
 		r = tokens[0]
 	default:
-		slog.Error("GVR init failed!", slogs.Error, fmt.Errorf("can't parse GVR %q", path))
+		slog.Error("GVR init failed!", slogs.Error, fmt.Errorf("can't parse GVR %q", s))
 	}
 
-	gvr := GVR{raw: path, g: g, v: v, r: r, sr: sr}
+	gvr := GVR{raw: s, g: g, v: v, r: r, sr: sr}
 	if cgvr := gvrsCache.get(gvr.String()); cgvr != nil {
 		return cgvr
 	}
@@ -204,6 +205,19 @@ func (g *GVR) IsDecodable() bool {
 	return g.GVK().Kind == "secrets"
 }
 
+var _ = yaml.Marshaler((*GVR)(nil))
+var _ = yaml.Unmarshaler((*GVR)(nil))
+
+func (g *GVR) MarshalYAML() (any, error) {
+	return g.String(), nil
+}
+
+func (g *GVR) UnmarshalYAML(n *yaml.Node) error {
+	*g = *NewGVR(n.Value)
+
+	return nil
+}
+
 // GVRs represents a collection of gvr.
 type GVRs []*GVR
 

internal/client/helpers.go

@@ -15,7 +15,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-var toFileName = regexp.MustCompile(`[^(\w/\.)]`)
+var toFileName = regexp.MustCompile(`[^(\w/.)]`)
 
 // IsClusterWide returns true if ns designates cluster scope, false otherwise.
 func IsClusterWide(ns string) bool {

internal/client/metrics.go

@@ -318,17 +318,19 @@ func ToMB(v int64) int64 {
 }
 
 // ToPercentage computes percentage as string otherwise n/aa.
-func ToPercentage(v1, v2 int64) int {
-	if v2 == 0 {
+func ToPercentage(v, dv int64) int {
+	if dv == 0 {
 		return 0
 	}
-	return int(math.Floor((float64(v1) / float64(v2)) * 100))
+
+	return int(math.Floor((float64(v) / float64(dv)) * 100))
 }
 
 // ToPercentageStr computes percentage, but if v2 is 0, it will return NAValue instead of 0.
-func ToPercentageStr(v1, v2 int64) string {
-	if v2 == 0 {
+func ToPercentageStr(v, dv int64) string {
+	if dv == 0 {
 		return NA
 	}
-	return strconv.Itoa(ToPercentage(v1, v2))
+
+	return strconv.Itoa(ToPercentage(v, dv))
 }

internal/config/alias.go

@@ -19,17 +19,19 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 
-// Alias tracks shortname to GVR mappings.
-type Alias map[string]*client.GVR
+type (
+	// Alias tracks shortname to GVR mappings.
+	Alias map[string]*client.GVR
 
-// ShortNames represents a collection of shortnames for aliases.
-type ShortNames map[*client.GVR][]string
+	// ShortNames represents a collection of shortnames for aliases.
+	ShortNames map[*client.GVR][]string
 
-// Aliases represents a collection of aliases.
-type Aliases struct {
-	Alias Alias `yaml:"aliases"`
-	mx    sync.RWMutex
-}
+	// Aliases represents a collection of aliases.
+	Aliases struct {
+		Alias Alias `yaml:"aliases"`
+		mx    sync.RWMutex
+	}
+)
 
 // NewAliases return a new alias.
 func NewAliases() *Aliases {
@@ -108,6 +110,7 @@ func (a *Aliases) Get(alias string) (*client.GVR, bool) {
 func (a *Aliases) Define(gvr *client.GVR, aliases ...string) {
 	a.mx.Lock()
 	defer a.mx.Unlock()
+
 	for _, alias := range aliases {
 		if _, ok := a.Alias[alias]; !ok && alias != "" {
 			a.Alias[alias] = gvr
@@ -131,16 +134,6 @@ func (a *Aliases) Load(path string) error {
 	return a.LoadFile(path)
 }
 
-type aliases struct {
-	Alias map[string]string `yaml:"aliases"`
-}
-
-func newAliases(s int) aliases {
-	return aliases{
-		Alias: make(map[string]string, s),
-	}
-}
-
 // LoadFile loads alias from a given file.
 func (a *Aliases) LoadFile(path string) error {
 	if _, err := os.Stat(path); errors.Is(err, fs.ErrNotExist) {
@@ -155,14 +148,10 @@ func (a *Aliases) LoadFile(path string) error {
 		slog.Warn("Aliases validation failed", slogs.Error, err)
 	}
 
-	var aa aliases
-	if err := yaml.Unmarshal(bb, &aa); err != nil {
-		return err
-	}
 	a.mx.Lock()
 	defer a.mx.Unlock()
-	for alias, cmd := range aa.Alias {
-		a.Alias[alias] = client.NewGVR(cmd)
+	if err := yaml.Unmarshal(bb, a); err != nil {
+		return err
 	}
 
 	return nil
@@ -198,18 +187,17 @@ func (a *Aliases) loadDefaultAliases() {
 // Save alias to disk.
 func (a *Aliases) Save() error {
 	slog.Debug("Saving Aliases...")
-	return a.SaveAliases(AppAliasesFile)
+	a.mx.RLock()
+	defer a.mx.RUnlock()
+
+	return a.saveAliases(AppAliasesFile)
 }
 
 // SaveAliases saves aliases to a given file.
-func (a *Aliases) SaveAliases(path string) error {
+func (a *Aliases) saveAliases(path string) error {
 	if err := data.EnsureDirPath(path, data.DefaultDirMod); err != nil {
 		return err
 	}
-	aa := newAliases(len(a.Alias))
-	for alias, gvr := range a.Alias {
-		aa.Alias[alias] = gvr.String()
-	}
 
-	return data.SaveYAML(path, aa)
+	return data.SaveYAML(path, a)
 }

internal/config/config.go

@@ -186,16 +186,16 @@ func (c *Config) ActiveView() string {
 	if err != nil {
 		return data.DefaultView
 	}
-	cmd := ct.View.Active
+	v := ct.View.Active
 	if c.K9s.manualCommand != nil && *c.K9s.manualCommand != "" {
-		cmd = *c.K9s.manualCommand
+		v = *c.K9s.manualCommand
 		// We reset the manualCommand property because
 		// the command-line switch should only be considered once,
 		// on startup.
 		*c.K9s.manualCommand = ""
 	}
 
-	return cmd
+	return v
 }
 
 func (c *Config) ResetActiveView() {

internal/dao/accessor.go

@@ -8,44 +8,44 @@ import (
 )
 
 var accessors = Accessors{
-	*client.WkGVR:  new(Workload),
-	*client.CtGVR:  new(Context),
-	*client.CoGVR:  new(Container),
-	*client.ScnGVR: new(ImageScan),
-	*client.SdGVR:  new(ScreenDump),
-	*client.BeGVR:  new(Benchmark),
-	*client.PfGVR:  new(PortForward),
-	*client.DirGVR: new(Dir),
-
-	*client.SvcGVR:  new(Service),
-	*client.PodGVR:  new(Pod),
-	*client.NodeGVR: new(Node),
-	*client.NsGVR:   new(Namespace),
-	*client.CmGVR:   new(ConfigMap),
-	*client.SecGVR:  new(Secret),
-
-	*client.DpGVR:  new(Deployment),
-	*client.DsGVR:  new(DaemonSet),
-	*client.StsGVR: new(StatefulSet),
-	*client.RsGVR:  new(ReplicaSet),
-
-	*client.CjGVR:  new(CronJob),
-	*client.JobGVR: new(Job),
-
-	*client.HmGVR:  new(HelmChart),
-	*client.HmhGVR: new(HelmHistory),
-
-	*client.CrdGVR: new(CustomResourceDefinition),
+	client.WkGVR:  new(Workload),
+	client.CtGVR:  new(Context),
+	client.CoGVR:  new(Container),
+	client.ScnGVR: new(ImageScan),
+	client.SdGVR:  new(ScreenDump),
+	client.BeGVR:  new(Benchmark),
+	client.PfGVR:  new(PortForward),
+	client.DirGVR: new(Dir),
+
+	client.SvcGVR:  new(Service),
+	client.PodGVR:  new(Pod),
+	client.NodeGVR: new(Node),
+	client.NsGVR:   new(Namespace),
+	client.CmGVR:   new(ConfigMap),
+	client.SecGVR:  new(Secret),
+
+	client.DpGVR:  new(Deployment),
+	client.DsGVR:  new(DaemonSet),
+	client.StsGVR: new(StatefulSet),
+	client.RsGVR:  new(ReplicaSet),
+
+	client.CjGVR:  new(CronJob),
+	client.JobGVR: new(Job),
+
+	client.HmGVR:  new(HelmChart),
+	client.HmhGVR: new(HelmHistory),
+
+	client.CrdGVR: new(CustomResourceDefinition),
 }
 
 // Accessors represents a collection of dao accessors.
-type Accessors map[client.GVR]Accessor
+type Accessors map[*client.GVR]Accessor
 
 // AccessorFor returns a client accessor for a resource if registered.
 // Otherwise it returns a generic accessor.
 // Customize here for non resource types or types with metrics or logs.
 func AccessorFor(f Factory, gvr *client.GVR) (Accessor, error) {
-	r, ok := accessors[*gvr]
+	r, ok := accessors[gvr]
 	if !ok {
 		r = new(Scaler)
 		slog.Debug("No DAO registry entry. Using generics!", slogs.GVR, gvr)