diff --git a/internal/resource/container.go b/internal/resource/container.go index cb47b494..69ad324e 100644 --- a/internal/resource/container.go +++ b/internal/resource/container.go @@ -231,7 +231,7 @@ func toState(s v1.ContainerState) string { if s.Terminated.Reason != "" { return s.Terminated.Reason } - return "Terminated" + return "Terminating" case s.Running != nil: return "Running" default: diff --git a/internal/resource/container_test.go b/internal/resource/container_test.go index 9274e6bf..5e4458ed 100644 --- a/internal/resource/container_test.go +++ b/internal/resource/container_test.go @@ -83,9 +83,9 @@ func TestToState(t *testing.T) { v1.ContainerState{Waiting: &v1.ContainerStateWaiting{Reason: "blee"}}, "blee", }, - "terminated": { + "terminating": { v1.ContainerState{Terminated: &v1.ContainerStateTerminated{}}, - "Terminated", + "Terminating", }, "terminatedReason": { v1.ContainerState{Terminated: &v1.ContainerStateTerminated{Reason: "blee"}}, diff --git a/internal/resource/pod.go b/internal/resource/pod.go index 53a2ceb9..af2061d4 100644 --- a/internal/resource/pod.go +++ b/internal/resource/pod.go @@ -407,7 +407,7 @@ func (r *Pod) phase(po *v1.Pod) string { return status } - return "Terminated" + return "Terminating" } func (*Pod) containerPhase(st v1.PodStatus, status string) (bool, string) { diff --git a/internal/resource/pod_int_test.go b/internal/resource/pod_int_test.go index 784d8535..b332bcc4 100644 --- a/internal/resource/pod_int_test.go +++ b/internal/resource/pod_int_test.go @@ -66,11 +66,11 @@ func TestPodPhase(t *testing.T) { {makePodCoInitWaiting("p1", "PodInitializing"), "Init:0/1"}, {makePodCoWaiting("p1", "Waiting"), "Waiting"}, {makePodCoWaiting("p1", ""), ""}, - {makePodCoTerminated("p1", "OOMKilled", 0, true), "Terminated"}, + {makePodCoTerminated("p1", "OOMKilled", 0, true), "Terminating"}, {makePodCoTerminated("p1", "OOMKilled", 0, false), "OOMKilled"}, - {makePodCoTerminated("p1", "", 0, true), "Terminated"}, + {makePodCoTerminated("p1", "", 0, true), "Terminating"}, {makePodCoTerminated("p1", "", 0, false), "ExitCode:1"}, - {makePodCoTerminated("p1", "", 1, true), "Terminated"}, + {makePodCoTerminated("p1", "", 1, true), "Terminating"}, {makePodCoTerminated("p1", "", 1, false), "Signal:1"}, } diff --git a/internal/views/colorer.go b/internal/views/colorer.go index 312b2644..48b89bb1 100644 --- a/internal/views/colorer.go +++ b/internal/views/colorer.go @@ -55,7 +55,7 @@ func podColorer(ns string, r *resource.RowEvent) tcell.Color { switch strings.TrimSpace(r.Fields[statusCol]) { case "ContainerCreating", "PodInitializing": return ui.AddColor - case "Terminating", "Initialized": + case "Initialized": return ui.HighlightColor case "Completed": return ui.CompletedColor