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

Merge pull request #363 from brunohms/fix-terminated 

Change "Terminated" to "Terminating"
mine
Fernand Galiana 2019-10-17 07:12:49 -06:00 committed by GitHub
parent c557f2d7ee 36dbe2eed6
commit 1c35eaf12d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/resource/container.go
View File

@ -231,7 +231,7 @@ func toState(s v1.ContainerState) string {
if s.Terminated.Reason != "" { if s.Terminated.Reason != "" {
return s.Terminated.Reason return s.Terminated.Reason
} }
return "Terminated" return "Terminating"
case s.Running != nil: case s.Running != nil:
return "Running" return "Running"
default: default:

4
internal/resource/container_test.go
View File

@ -83,9 +83,9 @@ func TestToState(t *testing.T) {
v1.ContainerState{Waiting: &v1.ContainerStateWaiting{Reason: "blee"}}, v1.ContainerState{Waiting: &v1.ContainerStateWaiting{Reason: "blee"}},
"blee", "blee",
}, },
"terminated": { "terminating": {
v1.ContainerState{Terminated: &v1.ContainerStateTerminated{}}, v1.ContainerState{Terminated: &v1.ContainerStateTerminated{}},
"Terminated", "Terminating",
}, },
"terminatedReason": { "terminatedReason": {
v1.ContainerState{Terminated: &v1.ContainerStateTerminated{Reason: "blee"}}, v1.ContainerState{Terminated: &v1.ContainerStateTerminated{Reason: "blee"}},

2
internal/resource/pod.go
View File

@ -407,7 +407,7 @@ func (r *Pod) phase(po *v1.Pod) string {
return status return status
} }
return "Terminated" return "Terminating"
} }
func (*Pod) containerPhase(st v1.PodStatus, status string) (bool, string) { func (*Pod) containerPhase(st v1.PodStatus, status string) (bool, string) {

6
internal/resource/pod_int_test.go
View File

@ -66,11 +66,11 @@ func TestPodPhase(t *testing.T) {
{makePodCoInitWaiting("p1", "PodInitializing"), "Init:0/1"}, {makePodCoInitWaiting("p1", "PodInitializing"), "Init:0/1"},
{makePodCoWaiting("p1", "Waiting"), "Waiting"}, {makePodCoWaiting("p1", "Waiting"), "Waiting"},
{makePodCoWaiting("p1", ""), ""}, {makePodCoWaiting("p1", ""), ""},
{makePodCoTerminated("p1", "OOMKilled", 0, true), "Terminated"}, {makePodCoTerminated("p1", "OOMKilled", 0, true), "Terminating"},
{makePodCoTerminated("p1", "OOMKilled", 0, false), "OOMKilled"}, {makePodCoTerminated("p1", "OOMKilled", 0, false), "OOMKilled"},
{makePodCoTerminated("p1", "", 0, true), "Terminated"}, {makePodCoTerminated("p1", "", 0, true), "Terminating"},
{makePodCoTerminated("p1", "", 0, false), "ExitCode:1"}, {makePodCoTerminated("p1", "", 0, false), "ExitCode:1"},
{makePodCoTerminated("p1", "", 1, true), "Terminated"}, {makePodCoTerminated("p1", "", 1, true), "Terminating"},
{makePodCoTerminated("p1", "", 1, false), "Signal:1"}, {makePodCoTerminated("p1", "", 1, false), "Signal:1"},
} }

2
internal/views/colorer.go
View File

@ -55,7 +55,7 @@ func podColorer(ns string, r *resource.RowEvent) tcell.Color {
switch strings.TrimSpace(r.Fields[statusCol]) { switch strings.TrimSpace(r.Fields[statusCol]) {
case "ContainerCreating", "PodInitializing": case "ContainerCreating", "PodInitializing":
return ui.AddColor return ui.AddColor
case "Terminating", "Initialized": case "Initialized":
return ui.HighlightColor return ui.HighlightColor
case "Completed": case "Completed":
return ui.CompletedColor return ui.CompletedColor