ensure the correct active ns is listed when in node view
parent
11a0d1bb28
commit
332b62f4c1
|
|
@ -35,8 +35,8 @@ func (v *nodeView) sortColCmd(col int, asc bool) func(evt *tcell.EventKey) *tcel
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (v *nodeView) showPods(app *appView, _, res, sel string) {
|
func (v *nodeView) showPods(app *appView, _, _, sel string) {
|
||||||
showPods(app, "", "", "spec.nodeName="+sel, v.backCmd)
|
showPods(app, app.Config.ActiveNamespace(), "", "spec.nodeName="+sel, v.backCmd)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (v *nodeView) backCmd(evt *tcell.EventKey) *tcell.EventKey {
|
func (v *nodeView) backCmd(evt *tcell.EventKey) *tcell.EventKey {
|
||||||
|
|
@ -46,6 +46,8 @@ func (v *nodeView) backCmd(evt *tcell.EventKey) *tcell.EventKey {
|
||||||
}
|
}
|
||||||
|
|
||||||
func showPods(app *appView, ns, labelSel, fieldSel string, a ui.ActionHandler) {
|
func showPods(app *appView, ns, labelSel, fieldSel string, a ui.ActionHandler) {
|
||||||
|
app.switchNS(ns)
|
||||||
|
|
||||||
list := resource.NewPodList(app.Conn(), ns)
|
list := resource.NewPodList(app.Conn(), ns)
|
||||||
list.SetLabelSelector(labelSel)
|
list.SetLabelSelector(labelSel)
|
||||||
list.SetFieldSelector(fieldSel)
|
list.SetFieldSelector(fieldSel)
|
||||||
|
|
|
||||||
|
|
@ -313,6 +313,7 @@ func (v *resourceView) switchNamespaceCmd(evt *tcell.EventKey) *tcell.EventKey {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
v.app.switchNS(ns)
|
||||||
v.setNamespace(ns)
|
v.setNamespace(ns)
|
||||||
v.app.Flash().Infof("Viewing `%s` namespace...", ns)
|
v.app.Flash().Infof("Viewing `%s` namespace...", ns)
|
||||||
v.refresh()
|
v.refresh()
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,10 @@ type Informer struct {
|
||||||
|
|
||||||
// NewInformer creates a new cluster resource informer
|
// NewInformer creates a new cluster resource informer
|
||||||
func NewInformer(client k8s.Connection, ns string) (*Informer, error) {
|
func NewInformer(client k8s.Connection, ns string) (*Informer, error) {
|
||||||
i := Informer{client: client, informers: map[string]StoreInformer{}}
|
i := Informer{
|
||||||
|
client: client,
|
||||||
|
informers: map[string]StoreInformer{},
|
||||||
|
}
|
||||||
if err := client.CheckNSAccess(ns); err != nil {
|
if err := client.CheckNSAccess(ns); err != nil {
|
||||||
log.Error().Err(err).Msg("Checking NS Access")
|
log.Error().Err(err).Msg("Checking NS Access")
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue