fix(console): support terminating status and evicted reason show (#977)

tkestack · Dec 6, 2020 · 9ce96c3 · 9ce96c3
1 parent e003a53
commit 9ce96c3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/web/console/src/modules/cluster/actions/resourcePodActions.ts b/web/console/src/modules/cluster/actions/resourcePodActions.ts
@@ -88,8 +88,6 @@ const fetchPodActions = generateFetcherActionCreator({
       isNeedSpecific: false,
       isContinue: true
     });
-    // 原因为 Evicted的pod没有必要再进行展示，直接进行过滤
-    records = records.filter(item => item.status.reason !== 'Evicted');
 
     dispatch(resourcePodActions.changeContinueToken(continueToken));
 

diff --git a/web/console/src/modules/cluster/components/resource/resourceDetail/ResourcePodPanel.tsx b/web/console/src/modules/cluster/components/resource/resourceDetail/ResourcePodPanel.tsx
@@ -404,6 +404,16 @@ export class ResourcePodPanel extends React.Component<RootProps, ResourcePodPane
       });
     }
 
+    function getPodStatus(pod) {
+      let result = pod.status.phase;
+      if (pod.status.phase === 'Running' && pod.metadata.deletionTimestamp) {
+        result = <Text theme="warning">Terminating</Text>;
+      }
+      if (pod.status.reason) {
+        result = <>{pod.status.phase}<Text theme="warning">({pod.status.reason})</Text></>
+      }
+      return result;
+    }
     return (
       <div>
         <span
@@ -412,7 +422,7 @@ export class ResourcePodPanel extends React.Component<RootProps, ResourcePodPane
             'text-danger': isStatusOK && !isConditionOK
           })}
         >
-          {pod.status.phase}
+          {getPodStatus.call(this, pod)}
         </span>
         {(!isStatusOK || !isConditionOK) && pod.status.conditions && (
           <Bubble

diff --git a/web/console/src/modules/cluster/models/Pod.ts b/web/console/src/modules/cluster/models/Pod.ts
@@ -20,6 +20,8 @@ interface Metadata {
 
   creationTimestamp?: string;
 
+  deletionTimestamp?: string;
+
   name?: string;
 
   namespace?: string;
@@ -40,6 +42,8 @@ interface Status {
 
   phase?: string;
 
+  reason?: string;
+
   qosClass?: string;
 
   /** pod所在node 的ip */