diff --git a/internal/model/table_int_test.go b/internal/model/table_int_test.go index 41e5ce8268..7667efb8b6 100644 --- a/internal/model/table_int_test.go +++ b/internal/model/table_int_test.go @@ -105,7 +105,7 @@ func TestTableHydrate(t *testing.T) { assert.Nil(t, hydrate("blee", oo, rr, render.Pod{})) assert.Equal(t, 1, len(rr)) - assert.Equal(t, 23, len(rr[0].Fields)) + assert.Equal(t, 22, len(rr[0].Fields)) } func TestTableGenericHydrate(t *testing.T) { diff --git a/internal/render/node.go b/internal/render/node.go index 11e6d3989c..2e892b104b 100644 --- a/internal/render/node.go +++ b/internal/render/node.go @@ -53,11 +53,11 @@ func (Node) Header(_ string) Header { func (n Node) Render(o interface{}, ns string, r *Row) error { oo, ok := o.(*NodeWithMetrics) if !ok { - return fmt.Errorf("Expected *NodeAndMetrics, but got %T", o) + return fmt.Errorf("expected *NodeAndMetrics, but got %T", o) } meta, ok := oo.Raw.Object["metadata"].(map[string]interface{}) if !ok { - return fmt.Errorf("Unable to extract meta") + return fmt.Errorf("unable to extract meta") } na := extractMetaField(meta, "name") var no v1.Node diff --git a/internal/render/pod.go b/internal/render/pod.go index 8d62ff4a76..afbcd7da81 100644 --- a/internal/render/pod.go +++ b/internal/render/pod.go @@ -124,7 +124,6 @@ func (p Pod) Render(o interface{}, ns string, row *Row) error { po.ObjectMeta.Name, "●", strconv.Itoa(cr) + "/" + strconv.Itoa(len(po.Spec.Containers)), - strconv.Itoa(rc), phase, strconv.Itoa(rc), na(po.Status.PodIP), diff --git a/internal/render/pod_test.go b/internal/render/pod_test.go index 466dd202b6..e439b6caf2 100644 --- a/internal/render/pod_test.go +++ b/internal/render/pod_test.go @@ -159,7 +159,7 @@ func TestPodRender(t *testing.T) { assert.Nil(t, err) assert.Equal(t, "default/nginx", r.ID) - e := render.Fields{"default", "nginx", "●", "1/1", "0", "Running", "0", "172.17.0.6", "minikube", "", "", "100", "50", "100:0", "70:170", "100", "n/a"} + e := render.Fields{"default", "nginx", "●", "1/1", "Running", "0", "172.17.0.6", "minikube", "", "", "100", "50", "100:0", "70:170", "100", "n/a", "71"} assert.Equal(t, e, r.Fields[:17]) } @@ -190,7 +190,7 @@ func TestPodInitRender(t *testing.T) { assert.Nil(t, err) assert.Equal(t, "default/nginx", r.ID) - e := render.Fields{"default", "nginx", "●", "1/1", "0", "Init:0/1", "0", "172.17.0.6", "minikube", "", "", "10", "10", "100:0", "70:170", "10", "n/a"} + e := render.Fields{"default", "nginx", "●", "1/1", "Init:0/1", "0", "172.17.0.6", "minikube", "", "", "10", "10", "100:0", "70:170", "10", "n/a", "14"} assert.Equal(t, e, r.Fields[:17]) }