From 66e977ac1452ebc183154d6df5f9bef9ce4a7b8c Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Thu, 16 Apr 2020 16:46:33 +0300 Subject: [PATCH] Show pod terminating status (#259) Signed-off-by: Jari Kolehmainen --- dashboard/client/api/endpoints/pods.api.ts | 4 +++- dashboard/client/components/+workloads/workloads-mixins.scss | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dashboard/client/api/endpoints/pods.api.ts b/dashboard/client/api/endpoints/pods.api.ts index adb00cbea7..b7072876f7 100644 --- a/dashboard/client/api/endpoints/pods.api.ts +++ b/dashboard/client/api/endpoints/pods.api.ts @@ -298,6 +298,9 @@ export class Pod extends WorkloadKubeObject { // Returns pod phase or container error if occured getStatusMessage() { + if (this.getReason() === PodStatus.EVICTED) return "Evicted"; + if (this.getStatus() === PodStatus.RUNNING && this.metadata.deletionTimestamp) return "Terminating"; + let message = ""; const statuses = this.getContainerStatuses(false); // not including initContainers if (statuses.length) { @@ -313,7 +316,6 @@ export class Pod extends WorkloadKubeObject { } }) } - if (this.getReason() === PodStatus.EVICTED) return "Evicted"; if (message) return message; return this.getStatusPhase(); } diff --git a/dashboard/client/components/+workloads/workloads-mixins.scss b/dashboard/client/components/+workloads/workloads-mixins.scss index d3b2a10b97..84bcca8219 100644 --- a/dashboard/client/components/+workloads/workloads-mixins.scss +++ b/dashboard/client/components/+workloads/workloads-mixins.scss @@ -5,6 +5,7 @@ $pod-status-evicted-color: $colorError; $pod-status-succeeded-color: $colorSuccess; $pod-status-failed-color: $colorError; $pod-status-terminated-color: $colorTerminated; +$pod-status-terminating-color: $colorTerminated; $pod-status-unknown-color: $colorVague; $pod-status-complete-color: $colorSuccess; $pod-status-crash-loop-color: $colorError; @@ -33,6 +34,7 @@ $pod-status-color-list: ( waiting: $pod-status-pending-color, succeeded: $pod-status-succeeded-color, failed: $pod-status-failed-color, + terminating: $pod-status-terminating-color, terminated: $pod-status-terminated-color, completed: $pod-status-complete-color, crash-loop-back-off: $pod-status-crash-loop-color,