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

fix bugs

mine
Mike Hummel 2020-02-17 23:47:43 +01:00
parent fa74d4a782
commit ef311c7fac
6 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/view/container.go
View File

@ -106,7 +106,7 @@ func (c *Container) attachCmd(evt *tcell.EventKey) *tcell.EventKey {
c.Stop() c.Stop()
defer c.Start() defer c.Start()
attachIn(c.App(), c.GetTable().Path, sel) attachIn(c.App(), c.GetTable().Path)
return nil return nil
} }

2
internal/view/container_test.go
View File

@ -13,5 +13,5 @@ func TestContainerNew(t *testing.T) {
assert.Nil(t, c.Init(makeCtx())) assert.Nil(t, c.Init(makeCtx()))
assert.Equal(t, "Containers", c.Name()) assert.Equal(t, "Containers", c.Name())
assert.Equal(t, 13, len(c.Hints())) assert.Equal(t, 14, len(c.Hints()))
} }

8
internal/view/help_test.go
View File

@ -21,8 +21,10 @@ func TestHelp(t *testing.T) {
v := view.NewHelp() v := view.NewHelp()
assert.Nil(t, v.Init(ctx)) assert.Nil(t, v.Init(ctx))
assert.Equal(t, 19, v.GetRowCount()) assert.Equal(t, 20, v.GetRowCount())
assert.Equal(t, 8, v.GetColumnCount()) assert.Equal(t, 8, v.GetColumnCount())
assert.Equal(t, "<ctrl-k>", strings.TrimSpace(v.GetCell(1, 0).Text)) assert.Equal(t, "<a>", strings.TrimSpace(v.GetCell(1, 0).Text))
assert.Equal(t, "Kill", strings.TrimSpace(v.GetCell(1, 1).Text)) assert.Equal(t, "Attach", strings.TrimSpace(v.GetCell(1, 1).Text))
// assert.Equal(t, "<ctrl-k>", strings.TrimSpace(v.GetCell(1, 0).Text))
// assert.Equal(t, "Kill", strings.TrimSpace(v.GetCell(1, 1).Text))
} }

10
internal/view/pod.go
View File

@ -159,13 +159,13 @@ func (p *Pod) attachCmd(evt *tcell.EventKey) *tcell.EventKey {
return evt return evt
} }
if len(cc) == 1 { if len(cc) == 1 {
p.attachIn(sel, "") p.attachIn(sel)
return nil return nil
} }
picker := NewPicker() picker := NewPicker()
picker.populate(cc) picker.populate(cc)
picker.SetSelectedFunc(func(i int, t, d string, r rune) { picker.SetSelectedFunc(func(i int, t, d string, r rune) {
p.attachIn(sel, t) p.attachIn(sel)
}) })
if err := p.App().inject(picker); err != nil { if err := p.App().inject(picker); err != nil {
p.App().Flash().Err(err) p.App().Flash().Err(err)
@ -180,9 +180,9 @@ func (p *Pod) shellIn(path, co string) {
p.Start() p.Start()
} }
func (p *Pod) attachIn(path, co string) { func (p *Pod) attachIn(path string) {
p.Stop() p.Stop()
attachIn(p.App(), path, co) attachIn(p.App(), path)
p.Start() p.Start()
} }
@ -221,7 +221,7 @@ func shellIn(a *App, path, co string) {
} }
} }
func attachIn(a *App, path, co string) { func attachIn(a *App, path string) {
args := computeAttachArgs(path, a.Config.K9s.CurrentContext, a.Conn().Config().Flags().KubeConfig) args := computeAttachArgs(path, a.Config.K9s.CurrentContext, a.Conn().Config().Flags().KubeConfig)
log.Debug().Msgf("Attach args %v", args) log.Debug().Msgf("Attach args %v", args)
if !runK(true, a, args...) { if !runK(true, a, args...) {

2
internal/view/pod_test.go
View File

@ -16,7 +16,7 @@ func TestPodNew(t *testing.T) {
assert.Nil(t, po.Init(makeCtx())) assert.Nil(t, po.Init(makeCtx()))
assert.Equal(t, "Pods", po.Name()) assert.Equal(t, "Pods", po.Name())
assert.Equal(t, 18, len(po.Hints())) assert.Equal(t, 19, len(po.Hints()))
} }
// Helpers... // Helpers...

7
internal/view/xray.go
View File

@ -269,8 +269,7 @@ func (x *Xray) attachCmd(evt *tcell.EventKey) *tcell.EventKey {
} }
if ref.Parent != nil { if ref.Parent != nil {
_, co := client.Namespaced(ref.Path) x.attachIn(ref.Parent.Path)
x.attachIn(ref.Parent.Path, co)
} else { } else {
log.Error().Msgf("No parent found on container node %q", ref.Path) log.Error().Msgf("No parent found on container node %q", ref.Path)
} }
@ -278,9 +277,9 @@ func (x *Xray) attachCmd(evt *tcell.EventKey) *tcell.EventKey {
return nil return nil
} }
func (x *Xray) attachIn(path, co string) { func (x *Xray) attachIn(path string) {
x.Stop() x.Stop()
attachIn(x.app, path, co) attachIn(x.app, path)
x.Start() x.Start()
} }