Merge pull request #6032 from jeff-phillips-18/resource-fix

Add kind and apiVersion to resources returned from k8sList
openshift · Jul 21, 2020 · 7726c31 · 7726c31
2 parents 347595e + 300e10c
commit 7726c31
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 46 deletions.
diff --git a/frontend/packages/console-shared/src/utils/resource-utils.ts b/frontend/packages/console-shared/src/utils/resource-utils.ts
@@ -810,12 +810,6 @@ export const createDeploymentConfigItem = (
   resources: any,
   utils?: OverviewResourceUtil[],
 ): OverviewItem => {
-  if (!deploymentConfig.apiVersion) {
-    deploymentConfig.apiVersion = apiVersionForModel(DeploymentConfigModel);
-  }
-  if (!deploymentConfig.kind) {
-    deploymentConfig.kind = DeploymentConfigModel.kind;
-  }
   const { mostRecentRC, visibleReplicationControllers } = getReplicationControllersForResource(
     deploymentConfig,
     resources,
@@ -871,12 +865,6 @@ export const createDeploymentItem = (
   resources: any,
   utils?: OverviewResourceUtil[],
 ): OverviewItem => {
-  if (!deployment.apiVersion) {
-    deployment.apiVersion = apiVersionForModel(DeploymentModel);
-  }
-  if (!deployment.kind) {
-    deployment.kind = DeploymentModel.kind;
-  }
   const replicaSets = getReplicaSetsForResource(deployment, resources);
   const [current, previous] = replicaSets;
   const isRollingOut = !!current && !!previous;
@@ -926,12 +914,6 @@ export const createCronJobItem = (
   resources: any,
   utils?: OverviewResourceUtil[],
 ): OverviewItem => {
-  if (!cronJob.apiVersion) {
-    cronJob.apiVersion = apiVersionForModel(CronJobModel);
-  }
-  if (!cronJob.kind) {
-    cronJob.kind = CronJobModel.kind;
-  }
   const buildConfigs = getBuildConfigsForCronJob(cronJob, resources);
   const jobs = getJobsForCronJob(cronJob, resources);
   const pods = jobs?.reduce((acc, job) => {
@@ -978,21 +960,6 @@ export const getStandaloneJobs = (jobs: JobKind[]) => {
   return jobs.filter((job) => !job.metadata?.ownerReferences?.length);
 };
 
-export const createWorkloadItem = (
-  model: K8sKind,
-  obj: K8sResourceKind,
-  resources: any,
-  utils?: OverviewResourceUtil[],
-): OverviewItem => {
-  if (!obj.apiVersion) {
-    obj.apiVersion = apiVersionForModel(model);
-  }
-  if (!obj.kind) {
-    obj.kind = model.kind;
-  }
-  return getOverviewItemsForResource(obj, resources, isKindMonitorable(model), utils);
-};
-
 export const createWorkloadItems = (
   model: K8sKind,
   typedItems: K8sResourceKind[],
@@ -1002,16 +969,12 @@ export const createWorkloadItems = (
   if (!typedItems) {
     return [];
   }
-  return typedItems.map((d) => createWorkloadItem(model, d, resources, utils));
+  return typedItems.map((d) =>
+    getOverviewItemsForResource(d, resources, isKindMonitorable(model), utils),
+  );
 };
 
 export const createPodItem = (pod: PodKind, resources: any): OverviewItem => {
-  if (!pod.apiVersion) {
-    pod.apiVersion = apiVersionForModel(PodModel);
-  }
-  if (!pod.kind) {
-    pod.kind = PodModel.kind;
-  }
   const owners = pod?.metadata?.ownerReferences;
   const phase = pod?.status?.phase;
   if (!_.isEmpty(owners) || phase === 'Succeeded' || phase === 'Failed') {
@@ -1087,13 +1050,23 @@ export const createOverviewItemForType = (
     case 'cronJobs':
       return createCronJobItem(resource as CronJobKind, resources, utils);
     case 'statefulSets':
-      return createWorkloadItem(StatefulSetModel, resource, resources, utils);
+      return getOverviewItemsForResource(
+        resource,
+        resources,
+        isKindMonitorable(StatefulSetModel),
+        utils,
+      );
     case 'daemonSets':
-      return createWorkloadItem(DaemonSetModel, resource, resources, utils);
+      return getOverviewItemsForResource(
+        resource,
+        resources,
+        isKindMonitorable(DaemonSetModel),
+        utils,
+      );
     case 'jobs':
       return resource.metadata?.ownerReferences?.length
         ? null
-        : createWorkloadItem(JobModel, resource, resources, utils);
+        : getOverviewItemsForResource(resource, resources, isKindMonitorable(JobModel), utils);
     case 'pods':
       return createPodItem(resource as PodKind, resources);
     default:

diff --git a/frontend/packages/dev-console/src/components/topology/__tests__/topology-test-data.ts b/frontend/packages/dev-console/src/components/topology/__tests__/topology-test-data.ts
@@ -460,6 +460,8 @@ export const samplePods: FirehoseResult<PodKind[]> = {
   loadError: '',
   data: [
     {
+      apiVersion: 'v1',
+      kind: 'Pod',
       metadata: {
         generateName: 'py-cron-1593000600-',
         annotations: {
@@ -498,6 +500,8 @@ export const samplePods: FirehoseResult<PodKind[]> = {
       },
     },
     {
+      apiVersion: 'v1',
+      kind: 'Pod',
       metadata: {
         generateName: 'py-cron-1593000600-',
         annotations: {
@@ -536,6 +540,8 @@ export const samplePods: FirehoseResult<PodKind[]> = {
       },
     },
     {
+      apiVersion: 'v1',
+      kind: 'Pod',
       metadata: {
         generateName: 'py-cron-1593002400-',
         annotations: {
@@ -574,6 +580,8 @@ export const samplePods: FirehoseResult<PodKind[]> = {
       },
     },
     {
+      apiVersion: 'v1',
+      kind: 'Pod',
       metadata: {
         annotations: {
           'k8s.v1.cni.cncf.io/network-status':
@@ -610,6 +618,8 @@ export const samplePods: FirehoseResult<PodKind[]> = {
       },
     },
     {
+      apiVersion: 'v1',
+      kind: 'Pod',
       metadata: {
         generateName: 'py-cron-1593002400-',
         annotations: {
@@ -648,6 +658,8 @@ export const samplePods: FirehoseResult<PodKind[]> = {
       },
     },
     {
+      apiVersion: 'v1',
+      kind: 'Pod',
       metadata: {
         generateName: 'py-cron-1593002400-',
         annotations: {
@@ -686,6 +698,8 @@ export const samplePods: FirehoseResult<PodKind[]> = {
       },
     },
     {
+      apiVersion: 'v1',
+      kind: 'Pod',
       metadata: {
         generateName: 'standalone-job-',
         annotations: {
@@ -839,6 +853,8 @@ export const samplePods: FirehoseResult<PodKind[]> = {
       },
     },
     {
+      apiVersion: 'v1',
+      kind: 'Pod',
       metadata: {
         annotations: {
           'k8s.v1.cni.cncf.io/network-status':
@@ -2059,6 +2075,8 @@ export const sampleStatefulSets: FirehoseResult = {
 export const sampleJobs: FirehoseResult = {
   data: [
     {
+      kind: 'Job',
+      apiVersion: 'batch/v1',
       metadata: {
         annotations: {
           'alpha.image.policy.openshift.io/resolve-names': '*',
@@ -2242,6 +2260,8 @@ export const sampleJobs: FirehoseResult = {
       },
     },
     {
+      kind: 'Job',
+      apiVersion: 'batch/v1',
       metadata: {
         name: 'standalone-job',
         namespace: 'jeff-project',
@@ -2542,6 +2562,8 @@ export const sampleJobs: FirehoseResult = {
 export const sampleCronJobs: FirehoseResult = {
   data: [
     {
+      kind: 'CronJob',
+      apiVersion: 'batch/v1beta1',
       metadata: {
         name: 'py-cron',
         namespace: 'jeff-project',

diff --git a/frontend/public/module/k8s/resource.js b/frontend/public/module/k8s/resource.js
@@ -129,9 +129,14 @@ export const k8sList = (kind, params = {}, raw = false, options = {}) => {
   }).join('&');
 
   const listURL = resourceURL(kind, { ns: params.ns });
-  return coFetchJSON(`${listURL}?${query}`, 'GET', options).then((result) =>
-    raw ? result : result.items,
-  );
+  return coFetchJSON(`${listURL}?${query}`, 'GET', options).then((result) => {
+    const typedItems = result.items?.map((i) => ({
+      kind: kind.kind,
+      apiVersion: result.apiVersion,
+      ...i,
+    }));
+    return raw ? { ...result, items: typedItems } : typedItems;
+  });
 };
 
 export const k8sListPartialMetadata = (kind, params = {}, raw = false) => {