From ec5b781c604563cddf0c9cd24b119861f7889f8c Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Thu, 22 Jul 2021 16:30:36 +0530
Subject: [PATCH 1/4] Display namespace of the deployment

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 .../components/DeploymentsAccordions/DeploymentDrawer.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.tsx b/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.tsx
index 2173f9bfe4..f197ab10ad 100644
--- a/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.tsx
+++ b/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.tsx
@@ -18,7 +18,7 @@ import React from 'react';
 import { V1Deployment } from '@kubernetes/client-node';
 import { KubernetesDrawer } from '../KubernetesDrawer/KubernetesDrawer';
 import { renderCondition } from '../../utils/pod';
-import { Typography, Grid } from '@material-ui/core';
+import { Typography, Grid, Chip } from '@material-ui/core';
 
 export const DeploymentDrawer = ({
   deployment,
@@ -66,6 +66,12 @@ export const DeploymentDrawer = ({
             Deployment
           </Typography>
         </Grid>
+        <Grid item>
+          <Chip
+            size="small"
+            label={`namespace: ${deployment.metadata?.namespace}` ?? 'default'}
+          />
+        </Grid>
       </Grid>
     </KubernetesDrawer>
   );

From e6aaf246c26b356c55d35d86b3694e82338d9ff3 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Thu, 22 Jul 2021 16:33:45 +0530
Subject: [PATCH 2/4] Updated changeset information

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 .changeset/olive-lamps-deny.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/olive-lamps-deny.md

diff --git a/.changeset/olive-lamps-deny.md b/.changeset/olive-lamps-deny.md
new file mode 100644
index 0000000000..923fd44aef
--- /dev/null
+++ b/.changeset/olive-lamps-deny.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes': patch
+---
+
+Enhanced deployment accordian to disply the name of namespace.

From 648217c3831872cd5731dfbcfd72082d65a65850 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Thu, 22 Jul 2021 16:46:07 +0530
Subject: [PATCH 3/4] Updated changeset information

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 .changeset/olive-lamps-deny.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/olive-lamps-deny.md b/.changeset/olive-lamps-deny.md
index 923fd44aef..ec6b279d68 100644
--- a/.changeset/olive-lamps-deny.md
+++ b/.changeset/olive-lamps-deny.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-kubernetes': patch
 ---
 
-Enhanced deployment accordian to disply the name of namespace.
+Enhanced deployment accordion to display the namespace of the deployment.

From 2dab51237cb87a88376307f86522a9698cd9ee59 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 29 Sep 2021 17:38:40 +0200
Subject: [PATCH 4/4] kubernetes: fix DeploymentDrawer conditional namespace
 rendering + add test

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../DeploymentDrawer.test.tsx                 | 31 +++++++++++++------
 .../DeploymentDrawer.tsx                      | 12 +++----
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.test.tsx b/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.test.tsx
index 7fc3a317da..da53db687b 100644
--- a/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.test.tsx
+++ b/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.test.tsx
@@ -15,20 +15,17 @@
  */
 
 import React from 'react';
-import { render } from '@testing-library/react';
 import * as deployments from '../../__fixtures__/2-deployments.json';
-import { wrapInTestApp } from '@backstage/test-utils';
+import { renderInTestApp } from '@backstage/test-utils';
 import { DeploymentDrawer } from './DeploymentDrawer';
 
 describe('DeploymentDrawer', () => {
   it('should render deployment drawer', async () => {
-    const { getByText, getAllByText } = render(
-      wrapInTestApp(
-        <DeploymentDrawer
-          deployment={(deployments as any).deployments[0]}
-          expanded
-        />,
-      ),
+    const { getByText, getAllByText } = await renderInTestApp(
+      <DeploymentDrawer
+        deployment={(deployments as any).deployments[0]}
+        expanded
+      />,
     );
 
     expect(getAllByText('dice-roller')).toHaveLength(2);
@@ -45,6 +42,22 @@ describe('DeploymentDrawer', () => {
     expect(getByText('600')).toBeInTheDocument();
     expect(getByText('Progressing')).toBeInTheDocument();
     expect(getByText('Available')).toBeInTheDocument();
+    expect(getByText('namespace: default')).toBeInTheDocument();
     expect(getAllByText('True')).toHaveLength(2);
   });
+
+  it('should render deployment drawer without namespace', async () => {
+    const deployment = (deployments as any).deployments[0];
+    const { queryByText } = await renderInTestApp(
+      <DeploymentDrawer
+        deployment={{
+          ...deployment,
+          metadata: { ...deployment.metadata, namespace: undefined },
+        }}
+        expanded
+      />,
+    );
+
+    expect(queryByText('namespace: default')).not.toBeInTheDocument();
+  });
 });
diff --git a/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.tsx b/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.tsx
index eae26fc35d..6d25702d70 100644
--- a/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.tsx
+++ b/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.tsx
@@ -27,6 +27,7 @@ export const DeploymentDrawer = ({
   deployment: V1Deployment;
   expanded?: boolean;
 }) => {
+  const namespace = deployment.metadata?.namespace;
   return (
     <KubernetesDrawer
       object={deployment}
@@ -66,12 +67,11 @@ export const DeploymentDrawer = ({
             Deployment
           </Typography>
         </Grid>
-        <Grid item>
-          <Chip
-            size="small"
-            label={`namespace: ${deployment.metadata?.namespace}` ?? 'default'}
-          />
-        </Grid>
+        {namespace && (
+          <Grid item>
+            <Chip size="small" label={`namespace: ${namespace}`} />
+          </Grid>
+        )}
       </Grid>
     </KubernetesDrawer>
   );