From 954a5939db56fc12d3cdc4f3ab6c03e1e71f945f Mon Sep 17 00:00:00 2001
From: Deepankumar <deepan0433@gmail.com>
Date: Thu, 15 Aug 2024 10:10:48 +0200
Subject: [PATCH] Liveness probe added in ContainerCard component (#25958)

* Liveness probe added in ContainerCard component

Signed-off-by: Deepankumar Loganathan <deepan0433@gmail.com>

* liveness probe shows only if available

Signed-off-by: Deepankumar Loganathan <deepan0433@gmail.com>

* changed return object from variable

Signed-off-by: Deepankumar Loganathan <deepan0433@gmail.com>

---------

Signed-off-by: Deepankumar Loganathan <deepan0433@gmail.com>
---
 .changeset/eight-moose-pull.md                |  5 ++++
 .../Pods/PodDrawer/ContainerCard.test.tsx     |  1 +
 .../Pods/PodDrawer/ContainerCard.tsx          | 27 +++++++++++--------
 3 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/eight-moose-pull.md

diff --git a/.changeset/eight-moose-pull.md b/.changeset/eight-moose-pull.md
new file mode 100644
index 0000000000..c5bc5ee66e
--- /dev/null
+++ b/.changeset/eight-moose-pull.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes-react': patch
+---
+
+`Liveness Probe` added in ContainerCard Component of PodDrawer
diff --git a/plugins/kubernetes-react/src/components/Pods/PodDrawer/ContainerCard.test.tsx b/plugins/kubernetes-react/src/components/Pods/PodDrawer/ContainerCard.test.tsx
index 6d64b8ad5b..3b131a617c 100644
--- a/plugins/kubernetes-react/src/components/Pods/PodDrawer/ContainerCard.test.tsx
+++ b/plugins/kubernetes-react/src/components/Pods/PodDrawer/ContainerCard.test.tsx
@@ -40,6 +40,7 @@ describe('ContainerCard', () => {
           },
           containerSpec: {
             readinessProbe: {},
+            livenessProbe: {},
           },
           containerStatus: {
             name: 'some-name',
diff --git a/plugins/kubernetes-react/src/components/Pods/PodDrawer/ContainerCard.tsx b/plugins/kubernetes-react/src/components/Pods/PodDrawer/ContainerCard.tsx
index cabda69b2c..1919bc112d 100644
--- a/plugins/kubernetes-react/src/components/Pods/PodDrawer/ContainerCard.tsx
+++ b/plugins/kubernetes-react/src/components/Pods/PodDrawer/ContainerCard.tsx
@@ -35,20 +35,25 @@ const getContainerHealthChecks = (
   containerSpec: IContainer,
   containerStatus: IContainerStatus,
 ): { [key: string]: boolean } => {
-  if (containerStatus.state?.terminated?.reason === 'Completed') {
-    return {
-      'not waiting to start': containerStatus.state?.waiting === undefined,
-      'no restarts': containerStatus.restartCount === 0,
-    };
-  }
-  return {
+  const healthCheck = {
     'not waiting to start': containerStatus.state?.waiting === undefined,
-    started: !!containerStatus.started,
-    ready: containerStatus.ready,
     'no restarts': containerStatus.restartCount === 0,
-    'readiness probe set':
-      containerSpec && containerSpec?.readinessProbe !== undefined,
   };
+  if (containerStatus.state?.terminated?.reason === 'Completed') {
+    return healthCheck;
+  }
+  Object.assign(
+    healthCheck,
+    { started: !!containerStatus.started },
+    { ready: containerStatus.ready },
+    { 'readiness probe set': containerSpec?.readinessProbe !== undefined },
+  );
+  if (containerSpec && containerSpec?.livenessProbe !== undefined) {
+    Object.assign(healthCheck, {
+      'liveness probe set': containerSpec.livenessProbe,
+    });
+  }
+  return healthCheck;
 };
 
 const getCurrentState = (containerStatus: IContainerStatus): string => {