List operator-backed services in the sidebar

Closes #3494

Signed-off-by: David Thompson <davthomp@redhat.com>

Author: datho7561

src/explorer.ts

@@ -24,11 +24,13 @@ import {
 import * as Helm from './helm/helm';
 import { Oc } from './oc/ocWrapper';
 import { Odo } from './odo/odoWrapper';
+import { getServiceKindStubs } from './openshift/service';
 import { KubeConfigUtils, getKubeConfigFiles } from './util/kubeUtils';
 import { Platform } from './util/platform';
 import { Progress } from './util/progress';
 import { FileContentChangeNotifier, WatchUtil } from './util/watch';
 import { vsCommand } from './vscommand';
+import { CustomResourceDefinitionStub } from './webview/common/createServiceTypes';
 
 type ExplorerItem = KubernetesObject | Helm.HelmRelease | Context | TreeItem;
 
@@ -223,11 +225,27 @@ export class OpenShiftExplorer implements TreeDataProvider<ExplorerItem>, Dispos
                 }
             }
         } else {
-            result = [
-                ...await Oc.Instance.getKubernetesObjects('DeploymentConfig'),
-                ...await Oc.Instance.getKubernetesObjects('Deployment'),
-                ...await Helm.getHelmReleases()
+
+            let serviceKinds: CustomResourceDefinitionStub[] = [];
+            try {
+                serviceKinds = await getServiceKindStubs();
+            } catch (_) {
+                // operator framework is not installed on cluster; do nothing
+            }
+
+            const toCollect = [
+                Oc.Instance.getKubernetesObjects('Deployment'),
+                Helm.getHelmReleases(),
+                ...serviceKinds.map(serviceKind => Oc.Instance.getKubernetesObjects(serviceKind.name))
             ];
+            if (await Oc.Instance.isOpenShiftCluster()) {
+                toCollect.push(
+                    Oc.Instance.getKubernetesObjects('DeploymentConfig'),
+                )
+            }
+
+            result = await Promise.all(toCollect).then(listOfLists => listOfLists.flatMap(a => a as ExplorerItem[]));
+
         }
         // don't show Open In Developer Dashboard if not openshift cluster
         const isOpenshiftCluster = await Oc.Instance.isOpenShiftCluster();

src/openshift/service.ts

@@ -3,7 +3,9 @@
  *  Licensed under the MIT License. See LICENSE file in the project root for license information.
  *-----------------------------------------------------------------------------------------------*/
 
+import { Oc } from '../oc/ocWrapper';
 import { vsCommand } from '../vscommand';
+import { ClusterServiceVersion, CustomResourceDefinitionStub } from '../webview/common/createServiceTypes';
 import CreateServiceViewLoader from '../webview/create-service/createServiceViewLoader';
 
 /**
@@ -15,3 +17,18 @@ export class Service {
         await CreateServiceViewLoader.loadView();
     }
 }
+
+export async function getServiceKindStubs(): Promise<CustomResourceDefinitionStub[]> {
+    const clusterServiceVersions = (await Oc.Instance.getKubernetesObjects(
+        'csv',
+    )) as ClusterServiceVersion[];
+    return clusterServiceVersions.flatMap(
+        (clusterServiceVersion) => {
+            const serviceKinds = clusterServiceVersion.spec.customresourcedefinitions.owned;
+            for (const serviceKind of serviceKinds) {
+                serviceKind.csvDescription = clusterServiceVersion.spec.description;
+            }
+            return serviceKinds;
+        },
+    );
+}

src/webview/create-service/createServiceViewLoader.ts

@@ -8,13 +8,14 @@ import { JSONSchema7 } from 'json-schema';
 import * as _ from 'lodash';
 import * as path from 'path';
 import * as vscode from 'vscode';
+import { OpenShiftExplorer } from '../../explorer';
 import { ClusterServiceVersionKind, CustomResourceDefinitionKind } from '../../k8s/olm/types';
 import { Oc } from '../../oc/ocWrapper';
 import { Odo } from '../../odo/odoWrapper';
+import { getServiceKindStubs } from '../../openshift/service';
 import { ExtensionID } from '../../util/constants';
 import { loadWebviewHtml } from '../common-ext/utils';
 import type {
-    ClusterServiceVersion,
     CustomResourceDefinitionStub,
     SpecDescriptor
 } from '../common/createServiceTypes';
@@ -147,6 +148,7 @@ export default class CreateServiceViewLoader {
                     void vscode.window.showInformationMessage(`Service ${(message.data as unknown as any).metadata.name} successfully created.` );
                     CreateServiceViewLoader.panel.dispose();
                     CreateServiceViewLoader.panel = undefined;
+                    OpenShiftExplorer.getInstance().refresh();
                 } catch (err) {
                     void CreateServiceViewLoader.panel.webview.postMessage({
                         action: 'error',
@@ -162,21 +164,6 @@ export default class CreateServiceViewLoader {
     }
 }
 
-async function getServiceKindStubs(): Promise<CustomResourceDefinitionStub[]> {
-    const clusterServiceVersions = (await Oc.Instance.getKubernetesObjects(
-        'csv',
-    )) as ClusterServiceVersion[];
-    return clusterServiceVersions.flatMap(
-        (clusterServiceVersion) => {
-            const serviceKinds = clusterServiceVersion.spec.customresourcedefinitions.owned;
-            for (const serviceKind of serviceKinds) {
-                serviceKind.csvDescription = clusterServiceVersion.spec.description;
-            }
-            return serviceKinds;
-        },
-    );
-}
-
 /**
  * @see `csv.ts`
  */