diff --git a/.changeset/olive-lamps-deny.md b/.changeset/olive-lamps-deny.md new file mode 100644 index 0000000000..ec6b279d68 --- /dev/null +++ b/.changeset/olive-lamps-deny.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-kubernetes': patch +--- + +Enhanced deployment accordion to display the namespace of the deployment. 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( - , - ), + const { getByText, getAllByText } = await renderInTestApp( + , ); 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( + , + ); + + 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 2d22caec7c..6d25702d70 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, @@ -27,6 +27,7 @@ export const DeploymentDrawer = ({ deployment: V1Deployment; expanded?: boolean; }) => { + const namespace = deployment.metadata?.namespace; return ( + {namespace && ( + + + + )} );