fix(dev-catalog): reject the internal objects when creating objects o…

…ut from CSV
openshift · Nov 21, 2019 · 040964e · 040964e
1 parent 82b4695
commit 040964e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/frontend/packages/operator-lifecycle-manager/src/dev-catalog.ts b/frontend/packages/operator-lifecycle-manager/src/dev-catalog.ts
@@ -4,6 +4,12 @@ import { ClusterServiceVersionKind } from './types';
 import { referenceForProvidedAPI, providedAPIsFor } from './components';
 import * as operatorLogo from './operator.svg';
 
+const isInternal = (crd) => {
+  const blacklistedAnnotation = 'operators.operatorframework.io/internal-objects';
+  const internalOpList = _.get(crd, ['csv', 'metadata', 'annotations', blacklistedAnnotation], []);
+  return internalOpList.find((op) => op === crd.name) || false;
+};
+
 export const normalizeClusterServiceVersions = (
   clusterServiceVersions: ClusterServiceVersionKind[],
 ): K8sResourceKind[] => {
@@ -24,6 +30,8 @@ export const normalizeClusterServiceVersions = (
           : all.concat([cur]),
       [],
     )
+    // remove internal CRDs
+    .filter((crd) => !isInternal(crd))
     .map((desc) => ({
       // NOTE: Faking a real k8s object to avoid fetching all CRDs
       obj: {

diff --git a/frontend/public/components/catalog/catalog-page.tsx b/frontend/public/components/catalog/catalog-page.tsx
@@ -114,15 +114,7 @@ export class CatalogListPage extends React.Component<CatalogListPageProps, Catal
       ...projectTemplateItems,
     ];
 
-    //blacklisting all CRDs with annotation 'operators.operatorframework.io/internal-object' set to true
-    const filteredItems = _.reject(items, [
-      'obj',
-      'metadata',
-      'annotations',
-      'operators.operatorframework.io/internal-object',
-    ]);
-
-    return _.sortBy(filteredItems, 'tileName');
+    return _.sortBy(items, 'tileName');
   }
 
   normalizeClusterServiceClasses(serviceClasses) {