Fix helm resource tab to show all resources

openshift · May 6, 2020 · 3d9ada7 · 3d9ada7
1 parent 84fa90e
commit 3d9ada7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/frontend/packages/dev-console/src/components/helm/details/resources/HelmReleaseResources.tsx b/frontend/packages/dev-console/src/components/helm/details/resources/HelmReleaseResources.tsx
@@ -3,7 +3,12 @@ import { match as RMatch } from 'react-router';
 import { safeLoadAll } from 'js-yaml';
 import { MultiListPage } from '@console/internal/components/factory';
 import { FirehoseResource } from '@console/internal/components/utils';
-import { K8sResourceKind } from '@console/internal/module/k8s';
+import {
+  K8sResourceKind,
+  referenceFor,
+  modelFor,
+  referenceForModel,
+} from '@console/internal/module/k8s';
 import { flattenReleaseResources } from '../../helm-utils';
 import { HelmRelease } from '../../helm-types';
 import HelmReleaseResourcesList from './HelmReleaseResourcesList';
@@ -20,14 +25,18 @@ const HelmReleaseResources: React.FC<HelmReleaseResourcesProps> = ({ match, cust
   const namespace = match.params.ns;
   const helmManifest = customData ? safeLoadAll(customData.manifest) : [];
   const helmManifestResources: FirehoseResource[] = helmManifest.map(
-    (resource: K8sResourceKind) => ({
-      kind: resource.kind,
-      name: resource.metadata.name,
-      namespace,
-      prop: `${resource.metadata.name}-${resource.kind.toLowerCase()}`,
-      isList: false,
-      optional: true,
-    }),
+    (resource: K8sResourceKind) => {
+      const resourceKind = referenceFor(resource);
+      const model = modelFor(resourceKind);
+      return {
+        ...(model.namespaced ? { namespace } : {}),
+        kind: model.crd ? referenceForModel(model) : model.kind,
+        name: resource.metadata.name,
+        prop: `${resource.metadata.name}-${resource.kind.toLowerCase()}`,
+        isList: false,
+        optional: true,
+      };
+    },
   );
   return (
     <MultiListPage

diff --git a/...nd/packages/dev-console/src/components/helm/details/resources/HelmReleaseResourcesRow.tsx b/...nd/packages/dev-console/src/components/helm/details/resources/HelmReleaseResourcesRow.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as _ from 'lodash';
 import { Link } from 'react-router-dom';
-import { K8sResourceKind } from '@console/internal/module/k8s';
+import { K8sResourceKind, referenceFor } from '@console/internal/module/k8s';
 import { Status } from '@console/shared';
 import { ResourceLink, Timestamp, resourcePath } from '@console/internal/components/utils';
 import { TableData, TableRow, RowFunction } from '@console/internal/components/factory';
@@ -13,13 +13,10 @@ const HelmReleaseResourcesRow: RowFunction<K8sResourceKind> = ({
   key,
   style,
 }) => {
+  const kind = referenceFor(resource);
   const status = resource.status?.replicas ? (
     <Link
-      to={`${resourcePath(
-        resource.kind,
-        resource.metadata.name,
-        resource.metadata.namespace,
-      )}/pods`}
+      to={`${resourcePath(kind, resource.metadata.name, resource.metadata.namespace)}/pods`}
       title="pods"
     >
       {resource.status.replicas || 0} of {resource.spec.replicas} pods
@@ -31,7 +28,7 @@ const HelmReleaseResourcesRow: RowFunction<K8sResourceKind> = ({
     <TableRow id={resource.metadata.uid} index={index} trKey={key} style={style}>
       <TableData className={tableColumnClasses.name}>
         <ResourceLink
-          kind={resource.kind}
+          kind={kind}
           name={resource.metadata.name}
           namespace={resource.metadata.namespace}
         />