Update job, replica set, and stateful set tables to show node instead…

… of owner
openshift · May 14, 2020 · 4691eea · 4691eea
1 parent 2e8e9dd
commit 4691eea
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/frontend/public/components/job.tsx b/frontend/public/components/job.tsx
@@ -5,7 +5,7 @@ import * as classNames from 'classnames';
 import { sortable } from '@patternfly/react-table';
 
 import { Status } from '@console/shared';
-import { getJobTypeAndCompletions, K8sKind, JobKind } from '../module/k8s';
+import { getJobTypeAndCompletions, K8sKind, JobKind, K8sResourceKind } from '../module/k8s';
 import { Conditions } from './conditions';
 import { DetailsPage, ListPage, Table, TableRow, TableData, RowFunction } from './factory';
 import { configureJobParallelismModal } from './modals';
@@ -15,6 +15,7 @@ import {
   Kebab,
   KebabAction,
   LabelList,
+  PodsComponent,
   ResourceKebab,
   ResourceLink,
   ResourceSummary,
@@ -193,14 +194,18 @@ const JobDetails: React.FC<JobsDetailsProps> = ({ obj: job }) => (
   </>
 );
 
+const JobPods: React.FC<JobPodsProps> = (props) => (
+  <PodsComponent {...props} customData={{ showNodes: true }} />
+);
+
 const { details, pods, editYaml, events } = navFactory;
 const JobsDetailsPage: React.FC<JobsDetailsPageProps> = (props) => (
   <DetailsPage
     {...props}
     getResourceStatus={jobStatus}
     kind={kind}
     menuActions={menuActions}
-    pages={[details(JobDetails), editYaml(), pods(), events(ResourceEventStream)]}
+    pages={[details(JobDetails), editYaml(), pods(JobPods), events(ResourceEventStream)]}
   />
 );
 const JobsList: React.FC = (props) => (
@@ -228,6 +233,10 @@ type JobsPageProps = {
   selector?: any;
 };
 
+type JobPodsProps = {
+  obj: K8sResourceKind;
+};
+
 type JobsDetailsPageProps = {
   match: any;
 };
diff --git a/frontend/public/components/replicaset.jsx b/frontend/public/components/replicaset.jsx
@@ -21,6 +21,7 @@ import {
   ResourceKebab,
   OwnerReferences,
   Timestamp,
+  PodsComponent,
 } from './utils';
 import { ResourceEventStream } from './events';
 import { VolumesTable } from './volumes-table';
@@ -89,6 +90,8 @@ const environmentComponent = (props) => (
   />
 );
 
+const ReplicaSetPods = (props) => <PodsComponent {...props} customData={{ showNodes: true }} />;
+
 const { details, editYaml, pods, envEditor, events } = navFactory;
 const ReplicaSetsDetailsPage = (props) => (
   <DetailsPage
@@ -97,7 +100,7 @@ const ReplicaSetsDetailsPage = (props) => (
     pages={[
       details(Details),
       editYaml(),
-      pods(),
+      pods(ReplicaSetPods),
       envEditor(environmentComponent),
       events(ResourceEventStream),
     ]}

diff --git a/frontend/public/components/stateful-set.tsx b/frontend/public/components/stateful-set.tsx
@@ -18,6 +18,7 @@ import {
   SectionHeading,
   navFactory,
   LoadingInline,
+  PodsComponent,
 } from './utils';
 import { VolumesTable } from './volumes-table';
 import { StatefulSetModel } from '../models';
@@ -115,10 +116,14 @@ export const StatefulSetsPage: React.FC<StatefulSetsPageProps> = (props) => (
   <ListPage {...props} ListComponent={StatefulSetsList} kind={kind} canCreate={true} />
 );
 
+const StatefulSetPods: React.FC<StatefulSetPodsProps> = (props) => (
+  <PodsComponent {...props} customData={{ showNodes: true }} />
+);
+
 const pages = [
   navFactory.details(StatefulSetDetails),
   navFactory.editYaml(),
-  navFactory.pods(),
+  navFactory.pods(StatefulSetPods),
   navFactory.envEditor(EnvironmentTab),
   navFactory.events(ResourceEventStream),
 ];
@@ -148,6 +153,10 @@ type StatefulSetsPageProps = {
   selector?: any;
 };
 
+type StatefulSetPodsProps = {
+  obj: K8sResourceKind;
+};
+
 type StatefulSetsDetailsPageProps = {
   match: any;
 };