Merge branch 'master' into extensions-api

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

src/renderer/components/+workloads-pods/pod-container-env.tsx

@@ -1,7 +1,6 @@
 import "./pod-container-env.scss";
 
 import React, { useEffect, useState } from "react";
-import flatten from "lodash/flatten";
 import { observer } from "mobx-react";
 import { Trans } from "@lingui/macro";
 import { IPodContainer, Secret } from "../../api/endpoints";
@@ -11,6 +10,7 @@ import { secretsStore } from "../+config-secrets/secrets.store";
 import { configMapsStore } from "../+config-maps/config-maps.store";
 import { Icon } from "../icon";
 import { base64, cssNames } from "../../utils";
+import _ from "lodash";
 
 interface Props {
   container: IPodContainer;
@@ -40,7 +40,9 @@ export const ContainerEnvironment = observer((props: Props) => {
   )
 
   const renderEnv = () => {
-    return env.map(variable => {
+    const orderedEnv = _.sortBy(env, 'name');
+
+    return orderedEnv.map(variable => {
       const { name, value, valueFrom } = variable
       let secretValue = null
 
@@ -89,7 +91,7 @@ export const ContainerEnvironment = observer((props: Props) => {
         </div>
       ))
     })
-    return flatten(envVars)
+    return _.flatten(envVars)
   }
 
   return (

src/renderer/components/+workloads-pods/pod-details-container.tsx

@@ -2,7 +2,7 @@ import "./pod-details-container.scss"
 
 import React from "react";
 import { t, Trans } from "@lingui/macro";
-import { IPodContainer, Pod } from "../../api/endpoints";
+import { IPodContainer, IPodContainerStatus, Pod } from "../../api/endpoints";
 import { DrawerItem } from "../drawer";
 import { cssNames } from "../../utils";
 import { StatusBrick } from "../status-brick";
@@ -21,12 +21,37 @@ interface Props {
 }
 
 export class PodDetailsContainer extends React.Component<Props> {
+  
+  renderStatus(state: string, status: IPodContainerStatus) {
+    const ready = status ? status.ready : ""
+    return (
+      <span className={cssNames("status", state)}>
+        {state}{ready ? `, ${_i18n._(t`ready`)}` : ""}
+        {state === 'terminated' ? ` - ${status.state.terminated.reason} (${_i18n._(t`exit code`)}: ${status.state.terminated.exitCode})` : ''}
+      </span>    
+    );
+  }
+
+  renderLastState(lastState: string, status: IPodContainerStatus) {
+    if (lastState === 'terminated') {
+      return (
+        <span>
+          {lastState}<br/> 
+          {_i18n._(t`Reason`)}: {status.lastState.terminated.reason} - {_i18n._(t`exit code`)}: {status.lastState.terminated.exitCode}<br/> 
+          {_i18n._(t`Started at`)}: {status.lastState.terminated.startedAt}<br/> 
+          {_i18n._(t`Finished at`)}: {status.lastState.terminated.finishedAt}<br/> 
+        </span>
+      )  
+    }
+  }
+
   render() {
     const { pod, container, metrics } = this.props
     if (!pod || !container) return null
     const { name, image, imagePullPolicy, ports, volumeMounts, command, args } = container
     const status = pod.getContainerStatuses().find(status => status.name === container.name)
     const state = status ? Object.keys(status.state)[0] : ""
+    const lastState = status ? Object.keys(status.lastState)[0] : ""
     const ready = status ? status.ready : ""
     const liveness = pod.getLivenessProbe(container)
     const readiness = pod.getReadinessProbe(container)
@@ -48,10 +73,12 @@ export class PodDetailsContainer extends React.Component<Props> {
         }
         {status &&
         <DrawerItem name={<Trans>Status</Trans>}>
-          <span className={cssNames("status", state)}>
-            {state}{ready ? `, ${_i18n._(t`ready`)}` : ""}
-            {state === 'terminated' ? ` - ${status.state.terminated.reason} (${_i18n._(t`exit code`)}: ${status.state.terminated.exitCode})` : ''}
-          </span>
+          {this.renderStatus(state, status)}
+        </DrawerItem>
+        }
+        {lastState &&
+        <DrawerItem name={<Trans>Last Status</Trans>}>
+          {this.renderLastState(lastState, status)}
         </DrawerItem>
         }
         <DrawerItem name={<Trans>Image</Trans>}>