cleaning up
derailed
parent
c61365a9c9
commit
637894bde6
|
|
@ -44,5 +44,5 @@ func (v *deployView) showPods(app *appView, _, res, sel string) {
|
|||
return
|
||||
}
|
||||
|
||||
showPods(app, ns, "Deployment", sel, l.String(), "", v.backCmd)
|
||||
showPods(app, ns, l.String(), "", v.backCmd)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,5 +44,5 @@ func (v *daemonSetView) showPods(app *appView, _, res, sel string) {
|
|||
return
|
||||
}
|
||||
|
||||
showPods(app, ns, "DaemonSet", sel, l.String(), "", v.backCmd)
|
||||
showPods(app, ns, l.String(), "", v.backCmd)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,62 +20,11 @@ func newJobView(t string, app *appView, list resource.List) resourceViewer {
|
|||
return &v
|
||||
}
|
||||
|
||||
// Handlers...
|
||||
|
||||
// func (v *jobView) logsCmd(evt *tcell.EventKey) *tcell.EventKey {
|
||||
// if v.viewLogs(false) {
|
||||
// return nil
|
||||
// }
|
||||
// return evt
|
||||
// }
|
||||
|
||||
// func (v *jobView) prevLogsCmd(evt *tcell.EventKey) *tcell.EventKey {
|
||||
// if v.viewLogs(true) {
|
||||
// return nil
|
||||
// }
|
||||
// return evt
|
||||
// }
|
||||
|
||||
// func (v *jobView) viewLogs(previous bool) bool {
|
||||
// if !v.rowSelected() {
|
||||
// return false
|
||||
// }
|
||||
|
||||
// cc, err := fetchContainers(v.list, v.selectedItem, true)
|
||||
// if err != nil {
|
||||
// v.app.flash().err(err)
|
||||
// log.Error().Err(err).Msgf("Unable to fetch containers for %s", v.selectedItem)
|
||||
// return false
|
||||
// }
|
||||
|
||||
// if len(cc) == 1 {
|
||||
// v.showLogs(v.selectedItem, cc[0], v.list.GetName(), v, previous)
|
||||
// return true
|
||||
// }
|
||||
|
||||
// picker := v.GetPrimitive("picker").(*selectList)
|
||||
// picker.populate(cc)
|
||||
// picker.SetSelectedFunc(func(i int, t, d string, r rune) {
|
||||
// v.showLogs(v.selectedItem, t, "picker", picker, previous)
|
||||
// })
|
||||
// v.switchPage("picker")
|
||||
|
||||
// return true
|
||||
// }
|
||||
|
||||
// func (v *jobView) showLogs(path, co, view string, parent loggable, prev bool) {
|
||||
// l := v.GetPrimitive("logs").(*logsView)
|
||||
// l.reload(co, parent, view, prev)
|
||||
// v.switchPage("logs")
|
||||
// }
|
||||
|
||||
func (v *jobView) extraActions(aa keyActions) {
|
||||
v.logResourceView.extraActions(aa)
|
||||
// aa[KeyL] = newKeyAction("Logs", v.logsCmd, true)
|
||||
// aa[KeyShiftL] = newKeyAction("Logs Previous", v.prevLogsCmd, true)
|
||||
}
|
||||
|
||||
func (v *jobView) showPods(app *appView, _, res, sel string) {
|
||||
func (v *jobView) showPods(app *appView, ns, res, sel string) {
|
||||
ns, n := namespaced(sel)
|
||||
j := k8s.NewJob(app.conn())
|
||||
job, err := j.Get(ns, n)
|
||||
|
|
@ -93,11 +42,5 @@ func (v *jobView) showPods(app *appView, _, res, sel string) {
|
|||
return
|
||||
}
|
||||
|
||||
showPods(app, "", "Job", sel, l.String(), "", v.backCmd)
|
||||
showPods(app, ns, l.String(), "", v.backCmd)
|
||||
}
|
||||
|
||||
// func (v *jobView) backCmd(evt *tcell.EventKey) *tcell.EventKey {
|
||||
// v.app.inject(v)
|
||||
|
||||
// return nil
|
||||
// }
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ func (v *nodeView) sortColCmd(col int, asc bool) func(evt *tcell.EventKey) *tcel
|
|||
}
|
||||
|
||||
func (v *nodeView) showPods(app *appView, _, res, sel string) {
|
||||
showPods(app, "", "Node", sel, "", "spec.nodeName="+sel, v.backCmd)
|
||||
showPods(app, "", "", "spec.nodeName="+sel, v.backCmd)
|
||||
}
|
||||
|
||||
func (v *nodeView) backCmd(evt *tcell.EventKey) *tcell.EventKey {
|
||||
|
|
@ -44,7 +44,7 @@ func (v *nodeView) backCmd(evt *tcell.EventKey) *tcell.EventKey {
|
|||
return nil
|
||||
}
|
||||
|
||||
func showPods(app *appView, ns, res, selected, labelSel, fieldSel string, b actionHandler) {
|
||||
func showPods(app *appView, ns, labelSel, fieldSel string, a actionHandler) {
|
||||
list := resource.NewPodList(app.conn(), ns)
|
||||
list.SetLabelSelector(labelSel)
|
||||
list.SetFieldSelector(fieldSel)
|
||||
|
|
@ -52,7 +52,7 @@ func showPods(app *appView, ns, res, selected, labelSel, fieldSel string, b acti
|
|||
pv := newPodView("Pods", app, list)
|
||||
pv.setColorerFn(podColorer)
|
||||
pv.setExtraActionsFn(func(aa keyActions) {
|
||||
aa[tcell.KeyEsc] = newKeyAction("Back", b, true)
|
||||
aa[tcell.KeyEsc] = newKeyAction("Back", a, true)
|
||||
})
|
||||
// Reset active namespace to all.
|
||||
app.config.SetActiveNamespace(ns)
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ func (v *replicaSetView) showPods(app *appView, ns, res, sel string) {
|
|||
return
|
||||
}
|
||||
|
||||
showPods(app, "", "ReplicaSet", sel, l.String(), "", v.backCmd)
|
||||
showPods(app, ns, l.String(), "", v.backCmd)
|
||||
}
|
||||
|
||||
func (v *replicaSetView) backCmd(evt *tcell.EventKey) *tcell.EventKey {
|
||||
|
|
|
|||
|
|
@ -44,5 +44,5 @@ func (v *statefulSetView) showPods(app *appView, ns, res, sel string) {
|
|||
return
|
||||
}
|
||||
|
||||
showPods(app, "", "StatefulSet", sel, l.String(), "", v.backCmd)
|
||||
showPods(app, ns, l.String(), "", v.backCmd)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue