jayjay
/
k9s
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: (views) use saved context view when switching (#2045) 

* fix: (views) use saved context view when switching

* fix: (app) remove unnecessary variable
mine
tyzbit 2023-05-07 10:15:11 -04:00 committed by GitHub
parent 005b10ea9b
commit 5657b3cd72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -260,8 +260,8 @@ K9s uses aliases to navigate most K8s resources.
| Fuzzy find a resource given a filter | `/`-f filter⏎ | |
| Bails out of view/command/filter mode | `<esc>` | |
| Key mapping to describe, view, edit, view logs,... | `d`,`v`, `e`, `l`,... | |
| To view and switch to another Kubernetes context | `:`ctx⏎ | |
| To view and switch to another Kubernetes context | `:`ctx context-name⏎ | |
| To view and switch to another Kubernetes context (Pod view) | `:`ctx⏎ | |
| To view and switch directl to another Kubernetes context (Last used view) | `:`ctx context-name⏎ | |
| To view and switch to another Kubernetes namespace | `:`ns⏎ | |
| To view all saved resources | `:`screendump or sd⏎ | |
| To delete a resource (TAB and ENTER to confirm) | `ctrl-d` | |

10
internal/view/app.go
View File

@ -398,7 +398,7 @@ func (a *App) isValidNS(ns string) (bool, error) {
return true, nil
}
func (a *App) switchContext(name string, loadPods bool) error {
func (a *App) switchContext(name string) error {
log.Debug().Msgf("--> Switching Context %q--%q", name, a.Config.ActiveView())
a.Halt()
defer a.Resume()
@ -412,10 +412,8 @@ func (a *App) switchContext(name string, loadPods bool) error {
if e := a.command.Reset(true); e != nil {
return e
}
v := a.Config.ActiveView()
if v == "" || isContextCmd(v) || loadPods {
v = "pod"
a.Config.SetActiveView(v)
if a.Config.ActiveView() == "" || isContextCmd(a.Config.ActiveView()) {
a.Config.SetActiveView("pod")
}
a.Config.Reset()
a.Config.K9s.CurrentContext = name
@ -433,7 +431,7 @@ func (a *App) switchContext(name string, loadPods bool) error {
a.Flash().Infof("Switching context to %s", name)
a.ReloadStyles(name)
a.gotoResource(v, "", true)
a.gotoResource(a.Config.ActiveView(), "", true)
a.clusterModel.Reset(a.factory)
}

4
internal/view/context.go
View File

@ -119,6 +119,6 @@ func useContext(app *App, name string) error {
log.Error().Err(err).Msgf("Context switch failed")
return err
}
return app.switchContext(name, true)
return app.switchContext(name)
}