@backstage/plugin-kubernetes-backend 0.7.0-next.3 → 0.7.1-next.1

package/dist/index.cjs.js

@@ -7,12 +7,13 @@ var Router = require('express-promise-router');
 var luxon = require('luxon');
 var errors = require('@backstage/errors');
 var container = require('@google-cloud/container');
+var catalogClient = require('@backstage/catalog-client');
+var catalogModel = require('@backstage/catalog-model');
 var clientNode = require('@kubernetes/client-node');
 var AWS = require('aws-sdk');
 var aws4 = require('aws4');
 var identity = require('@azure/identity');
 var lodash = require('lodash');
-var catalogModel = require('@backstage/catalog-model');
 var pluginAuthNode = require('@backstage/plugin-auth-node');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -46,56 +47,60 @@ class ConfigClusterLocator {
     this.clusterDetails = clusterDetails;
   }
   static fromConfig(config) {
-    return new ConfigClusterLocator(config.getConfigArray("clusters").map((c) => {
-      var _a, _b;
-      const authProvider = c.getString("authProvider");
-      const clusterDetails = {
-        name: c.getString("name"),
-        url: c.getString("url"),
-        serviceAccountToken: c.getOptionalString("serviceAccountToken"),
-        skipTLSVerify: (_a = c.getOptionalBoolean("skipTLSVerify")) != null ? _a : false,
-        skipMetricsLookup: (_b = c.getOptionalBoolean("skipMetricsLookup")) != null ? _b : false,
-        caData: c.getOptionalString("caData"),
-        authProvider
-      };
-      const dashboardUrl = c.getOptionalString("dashboardUrl");
-      if (dashboardUrl) {
-        clusterDetails.dashboardUrl = dashboardUrl;
-      }
-      const dashboardApp = c.getOptionalString("dashboardApp");
-      if (dashboardApp) {
-        clusterDetails.dashboardApp = dashboardApp;
-      }
-      if (c.has("dashboardParameters")) {
-        clusterDetails.dashboardParameters = c.get("dashboardParameters");
-      }
-      switch (authProvider) {
-        case "google": {
-          return clusterDetails;
-        }
-        case "aws": {
-          const assumeRole = c.getOptionalString("assumeRole");
-          const externalId = c.getOptionalString("externalId");
-          return { assumeRole, externalId, ...clusterDetails };
-        }
-        case "azure": {
-          return clusterDetails;
-        }
-        case "oidc": {
-          const oidcTokenProvider = c.getString("oidcTokenProvider");
-          return { oidcTokenProvider, ...clusterDetails };
+    return new ConfigClusterLocator(
+      config.getConfigArray("clusters").map((c) => {
+        var _a, _b;
+        const authProvider = c.getString("authProvider");
+        const clusterDetails = {
+          name: c.getString("name"),
+          url: c.getString("url"),
+          serviceAccountToken: c.getOptionalString("serviceAccountToken"),
+          skipTLSVerify: (_a = c.getOptionalBoolean("skipTLSVerify")) != null ? _a : false,
+          skipMetricsLookup: (_b = c.getOptionalBoolean("skipMetricsLookup")) != null ? _b : false,
+          caData: c.getOptionalString("caData"),
+          authProvider
+        };
+        const dashboardUrl = c.getOptionalString("dashboardUrl");
+        if (dashboardUrl) {
+          clusterDetails.dashboardUrl = dashboardUrl;
         }
-        case "serviceAccount": {
-          return clusterDetails;
+        const dashboardApp = c.getOptionalString("dashboardApp");
+        if (dashboardApp) {
+          clusterDetails.dashboardApp = dashboardApp;
         }
-        case "googleServiceAccount": {
-          return clusterDetails;
+        if (c.has("dashboardParameters")) {
+          clusterDetails.dashboardParameters = c.get("dashboardParameters");
         }
-        default: {
-          throw new Error(`authProvider "${authProvider}" has no config associated with it`);
+        switch (authProvider) {
+          case "google": {
+            return clusterDetails;
+          }
+          case "aws": {
+            const assumeRole = c.getOptionalString("assumeRole");
+            const externalId = c.getOptionalString("externalId");
+            return { assumeRole, externalId, ...clusterDetails };
+          }
+          case "azure": {
+            return clusterDetails;
+          }
+          case "oidc": {
+            const oidcTokenProvider = c.getString("oidcTokenProvider");
+            return { oidcTokenProvider, ...clusterDetails };
+          }
+          case "serviceAccount": {
+            return clusterDetails;
+          }
+          case "googleServiceAccount": {
+            return clusterDetails;
+          }
+          default: {
+            throw new Error(
+              `authProvider "${authProvider}" has no config associated with it`
+            );
+          }
         }
-      }
-    }));
+      })
+    );
   }
   async getClusters() {
     return this.clusterDetails;
@@ -149,12 +154,19 @@ class GkeClusterLocator {
     };
     const gkeClusterLocator = new GkeClusterLocator(options, client);
     if (refreshInterval) {
-      runPeriodically(() => gkeClusterLocator.refreshClusters(), refreshInterval.toMillis());
+      runPeriodically(
+        () => gkeClusterLocator.refreshClusters(),
+        refreshInterval.toMillis()
+      );
     }
     return gkeClusterLocator;
   }
   static fromConfig(config, refreshInterval = void 0) {
-    return GkeClusterLocator.fromConfigWithClient(config, new container__namespace.v1.ClusterManagerClient(), refreshInterval);
+    return GkeClusterLocator.fromConfigWithClient(
+      config,
+      new container__namespace.v1.ClusterManagerClient(),
+      refreshInterval
+    );
   }
   async getClusters() {
     var _a;
@@ -205,11 +217,47 @@ class GkeClusterLocator {
       });
       this.hasClusterDetails = true;
     } catch (e) {
-      throw new errors.ForwardedError(`There was an error retrieving clusters from GKE for projectId=${projectId} region=${region}`, e);
+      throw new errors.ForwardedError(
+        `There was an error retrieving clusters from GKE for projectId=${projectId} region=${region}`,
+        e
+      );
     }
   }
 }
 
+class CatalogClusterLocator {
+  constructor(catalogClient) {
+    this.catalogClient = catalogClient;
+  }
+  static fromConfig(catalogApi) {
+    return new CatalogClusterLocator(catalogApi);
+  }
+  async getClusters() {
+    const apiServerKey = `metadata.annotations.${catalogModel.ANNOTATION_KUBERNETES_API_SERVER}`;
+    const apiServerCaKey = `metadata.annotations.${catalogModel.ANNOTATION_KUBERNETES_API_SERVER_CA}`;
+    const authProviderKey = `metadata.annotations.${catalogModel.ANNOTATION_KUBERNETES_AUTH_PROVIDER}`;
+    const filter = {
+      kind: "Resource",
+      "spec.type": "kubernetes-cluster",
+      [apiServerKey]: catalogClient.CATALOG_FILTER_EXISTS,
+      [apiServerCaKey]: catalogClient.CATALOG_FILTER_EXISTS,
+      [authProviderKey]: catalogClient.CATALOG_FILTER_EXISTS
+    };
+    const clusters = await this.catalogClient.getEntities({
+      filter: [filter]
+    });
+    return clusters.items.map((entity) => {
+      const clusterDetails = {
+        name: entity.metadata.name,
+        url: entity.metadata.annotations[catalogModel.ANNOTATION_KUBERNETES_API_SERVER],
+        caData: entity.metadata.annotations[catalogModel.ANNOTATION_KUBERNETES_API_SERVER_CA],
+        authProvider: entity.metadata.annotations[catalogModel.ANNOTATION_KUBERNETES_AUTH_PROVIDER]
+      };
+      return clusterDetails;
+    });
+  }
+}
+
 class LocalKubectlProxyClusterLocator {
   constructor() {
     this.clusterDetails = [
@@ -231,25 +279,34 @@ class CombinedClustersSupplier {
     this.clusterSuppliers = clusterSuppliers;
   }
   async getClusters() {
-    return await Promise.all(this.clusterSuppliers.map((supplier) => supplier.getClusters())).then((res) => {
+    return await Promise.all(
+      this.clusterSuppliers.map((supplier) => supplier.getClusters())
+    ).then((res) => {
       return res.flat();
     }).catch((e) => {
       throw e;
     });
   }
 }
-const getCombinedClusterSupplier = (rootConfig, refreshInterval = void 0) => {
+const getCombinedClusterSupplier = (rootConfig, catalogClient, refreshInterval = void 0) => {
   const clusterSuppliers = rootConfig.getConfigArray("kubernetes.clusterLocatorMethods").map((clusterLocatorMethod) => {
     const type = clusterLocatorMethod.getString("type");
     switch (type) {
+      case "catalog":
+        return CatalogClusterLocator.fromConfig(catalogClient);
       case "localKubectlProxy":
         return new LocalKubectlProxyClusterLocator();
       case "config":
         return ConfigClusterLocator.fromConfig(clusterLocatorMethod);
       case "gke":
-        return GkeClusterLocator.fromConfig(clusterLocatorMethod, refreshInterval);
+        return GkeClusterLocator.fromConfig(
+          clusterLocatorMethod,
+          refreshInterval
+        );
       default:
-        throw new Error(`Unsupported kubernetes.clusterLocatorMethods: "${type}"`);
+        throw new Error(
+          `Unsupported kubernetes.clusterLocatorMethods: "${type}"`
+        );
     }
   });
   return new CombinedClustersSupplier(clusterSuppliers);
@@ -310,12 +367,17 @@ class KubernetesClientProvider {
 
 class GoogleKubernetesAuthTranslator {
   async decorateClusterDetailsWithAuth(clusterDetails, authConfig) {
-    const clusterDetailsWithAuthToken = Object.assign({}, clusterDetails);
+    const clusterDetailsWithAuthToken = Object.assign(
+      {},
+      clusterDetails
+    );
     const authToken = authConfig.google;
     if (authToken) {
       clusterDetailsWithAuthToken.serviceAccountToken = authToken;
     } else {
-      throw new Error("Google token not found under auth.google in request body");
+      throw new Error(
+        "Google token not found under auth.google in request body"
+      );
     }
     return clusterDetailsWithAuthToken;
   }
@@ -397,21 +459,33 @@ class AwsIamKubernetesAuthTranslator {
     return `k8s-aws-v1.${urlSafeBase64Url}`;
   }
   async decorateClusterDetailsWithAuth(clusterDetails) {
-    const clusterDetailsWithAuthToken = Object.assign({}, clusterDetails);
-    clusterDetailsWithAuthToken.serviceAccountToken = await this.getBearerToken(clusterDetails.name, clusterDetails.assumeRole, clusterDetails.externalId);
+    const clusterDetailsWithAuthToken = Object.assign(
+      {},
+      clusterDetails
+    );
+    clusterDetailsWithAuthToken.serviceAccountToken = await this.getBearerToken(
+      clusterDetails.name,
+      clusterDetails.assumeRole,
+      clusterDetails.externalId
+    );
     return clusterDetailsWithAuthToken;
   }
 }
 
 class GoogleServiceAccountAuthTranslator {
   async decorateClusterDetailsWithAuth(clusterDetails) {
-    const clusterDetailsWithAuthToken = Object.assign({}, clusterDetails);
+    const clusterDetailsWithAuthToken = Object.assign(
+      {},
+      clusterDetails
+    );
     const client = new container__namespace.v1.ClusterManagerClient();
     const accessToken = await client.auth.getAccessToken();
     if (accessToken) {
       clusterDetailsWithAuthToken.serviceAccountToken = accessToken;
     } else {
-      throw new Error("Unable to obtain access token for the current Google Application Default Credentials");
+      throw new Error(
+        "Unable to obtain access token for the current Google Application Default Credentials"
+      );
     }
     return clusterDetailsWithAuthToken;
   }
@@ -425,7 +499,10 @@ class AzureIdentityKubernetesAuthTranslator {
     this.accessToken = { token: "", expiresOnTimestamp: 0 };
   }
   async decorateClusterDetailsWithAuth(clusterDetails) {
-    const clusterDetailsWithAuthToken = Object.assign({}, clusterDetails);
+    const clusterDetailsWithAuthToken = Object.assign(
+      {},
+      clusterDetails
+    );
     clusterDetailsWithAuthToken.serviceAccountToken = await this.getToken();
     return clusterDetailsWithAuthToken;
   }
@@ -469,16 +546,23 @@ class AzureIdentityKubernetesAuthTranslator {
 class OidcKubernetesAuthTranslator {
   async decorateClusterDetailsWithAuth(clusterDetails, authConfig) {
     var _a;
-    const clusterDetailsWithAuthToken = Object.assign({}, clusterDetails);
+    const clusterDetailsWithAuthToken = Object.assign(
+      {},
+      clusterDetails
+    );
     const { oidcTokenProvider } = clusterDetails;
     if (!oidcTokenProvider || oidcTokenProvider === "") {
-      throw new Error(`oidc authProvider requires a configured oidcTokenProvider`);
+      throw new Error(
+        `oidc authProvider requires a configured oidcTokenProvider`
+      );
     }
     const authToken = (_a = authConfig.oidc) == null ? void 0 : _a[oidcTokenProvider];
     if (authToken) {
       clusterDetailsWithAuthToken.serviceAccountToken = authToken;
     } else {
-      throw new Error(`Auth token not found under oidc.${oidcTokenProvider} in request body`);
+      throw new Error(
+        `Auth token not found under oidc.${oidcTokenProvider} in request body`
+      );
     }
     return clusterDetailsWithAuthToken;
   }
@@ -509,7 +593,9 @@ class KubernetesAuthTranslatorGenerator {
         return new NoopKubernetesAuthTranslator();
       }
       default: {
-        throw new Error(`authProvider "${authProvider}" has no KubernetesAuthTranslator associated with it`);
+        throw new Error(
+          `authProvider "${authProvider}" has no KubernetesAuthTranslator associated with it`
+        );
       }
     }
   }
@@ -632,45 +718,61 @@ class KubernetesFanOutHandler {
     auth,
     customResources
   }) {
-    return this.fanOutRequests(entity, auth, /* @__PURE__ */ new Set(), customResources);
+    return this.fanOutRequests(
+      entity,
+      auth,
+      /* @__PURE__ */ new Set(),
+      customResources
+    );
   }
   async getKubernetesObjectsByEntity({
     entity,
     auth
   }) {
-    return this.fanOutRequests(entity, auth, this.objectTypesToFetch, this.customResources);
+    return this.fanOutRequests(entity, auth, this.objectTypesToFetch);
   }
   async fanOutRequests(entity, auth, objectTypesToFetch, customResources) {
     var _a, _b, _c, _d, _e, _f, _g;
     const entityName = ((_b = (_a = entity.metadata) == null ? void 0 : _a.annotations) == null ? void 0 : _b["backstage.io/kubernetes-id"]) || ((_c = entity.metadata) == null ? void 0 : _c.name);
     const clusterDetailsDecoratedForAuth = await this.decorateClusterDetailsWithAuth(entity, auth);
-    this.logger.info(`entity.metadata.name=${entityName} clusterDetails=[${clusterDetailsDecoratedForAuth.map((c) => c.name).join(", ")}]`);
+    this.logger.info(
+      `entity.metadata.name=${entityName} clusterDetails=[${clusterDetailsDecoratedForAuth.map((c) => c.name).join(", ")}]`
+    );
     const labelSelector = ((_e = (_d = entity.metadata) == null ? void 0 : _d.annotations) == null ? void 0 : _e["backstage.io/kubernetes-label-selector"]) || `backstage.io/kubernetes-id=${entityName}`;
     const namespace = (_g = (_f = entity.metadata) == null ? void 0 : _f.annotations) == null ? void 0 : _g["backstage.io/kubernetes-namespace"];
-    return Promise.all(clusterDetailsDecoratedForAuth.map((clusterDetailsItem) => {
-      return this.fetcher.fetchObjectsForService({
-        serviceId: entityName,
-        clusterDetails: clusterDetailsItem,
-        objectTypesToFetch,
-        labelSelector,
-        customResources: customResources.map((c) => ({
-          ...c,
-          objectType: "customresources"
-        })),
-        namespace
-      }).then((result) => this.getMetricsForPods(clusterDetailsItem, result)).then((r) => this.toClusterObjects(clusterDetailsItem, r));
-    })).then(this.toObjectsByEntityResponse);
+    return Promise.all(
+      clusterDetailsDecoratedForAuth.map((clusterDetailsItem) => {
+        return this.fetcher.fetchObjectsForService({
+          serviceId: entityName,
+          clusterDetails: clusterDetailsItem,
+          objectTypesToFetch,
+          labelSelector,
+          customResources: (customResources || clusterDetailsItem.customResources || this.customResources).map((c) => ({
+            ...c,
+            objectType: "customresources"
+          })),
+          namespace
+        }).then((result) => this.getMetricsForPods(clusterDetailsItem, result)).then((r) => this.toClusterObjects(clusterDetailsItem, r));
+      })
+    ).then(this.toObjectsByEntityResponse);
   }
   async decorateClusterDetailsWithAuth(entity, auth) {
     const clusterDetails = await (await this.serviceLocator.getClustersByEntity(entity)).clusters;
-    return await Promise.all(clusterDetails.map((cd) => {
-      const kubernetesAuthTranslator = this.getAuthTranslator(cd.authProvider);
-      return kubernetesAuthTranslator.decorateClusterDetailsWithAuth(cd, auth);
-    }));
+    return await Promise.all(
+      clusterDetails.map((cd) => {
+        const kubernetesAuthTranslator = this.getAuthTranslator(cd.authProvider);
+        return kubernetesAuthTranslator.decorateClusterDetailsWithAuth(
+          cd,
+          auth
+        );
+      })
+    );
   }
   toObjectsByEntityResponse(clusterObjects) {
     return {
-      items: clusterObjects.filter((item) => item.errors !== void 0 && item.errors.length >= 1 || item.resources !== void 0 && item.resources.length >= 1 && item.resources.some((fr) => fr.resources.length >= 1))
+      items: clusterObjects.filter(
+        (item) => item.errors !== void 0 && item.errors.length >= 1 || item.resources !== void 0 && item.resources.length >= 1 && item.resources.some((fr) => fr.resources.length >= 1)
+      )
     };
   }
   toClusterObjects(clusterDetails, [result, metrics]) {
@@ -697,20 +799,27 @@ class KubernetesFanOutHandler {
     if (clusterDetails.skipMetricsLookup) {
       return [result, []];
     }
-    const namespaces = new Set(result.responses.filter(isPodFetchResponse).flatMap((r) => r.resources).map((p) => {
-      var _a;
-      return (_a = p.metadata) == null ? void 0 : _a.namespace;
-    }).filter(isString));
-    const podMetrics = Array.from(namespaces).map((ns) => this.fetcher.fetchPodMetricsByNamespace(clusterDetails, ns));
+    const namespaces = new Set(
+      result.responses.filter(isPodFetchResponse).flatMap((r) => r.resources).map((p) => {
+        var _a;
+        return (_a = p.metadata) == null ? void 0 : _a.namespace;
+      }).filter(isString)
+    );
+    const podMetrics = Array.from(namespaces).map(
+      (ns) => this.fetcher.fetchPodMetricsByNamespace(clusterDetails, ns)
+    );
     return Promise.all([result, Promise.all(podMetrics)]);
   }
   getAuthTranslator(provider) {
     if (this.authTranslators[provider]) {
       return this.authTranslators[provider];
     }
-    this.authTranslators[provider] = KubernetesAuthTranslatorGenerator.getKubernetesAuthTranslatorInstance(provider, {
-      logger: this.logger
-    });
+    this.authTranslators[provider] = KubernetesAuthTranslatorGenerator.getKubernetesAuthTranslatorInstance(
+      provider,
+      {
+        logger: this.logger
+      }
+    );
     return this.authTranslators[provider];
   }
 }
@@ -748,18 +857,28 @@ class KubernetesClientBasedFetcher {
   }
   fetchObjectsForService(params) {
     const fetchResults = Array.from(params.objectTypesToFetch).concat(params.customResources).map((toFetch) => {
-      return this.fetchResource(params.clusterDetails, toFetch, params.labelSelector || `backstage.io/kubernetes-id=${params.serviceId}`, toFetch.objectType, params.namespace).catch(this.captureKubernetesErrorsRethrowOthers.bind(this));
+      return this.fetchResource(
+        params.clusterDetails,
+        toFetch,
+        params.labelSelector || `backstage.io/kubernetes-id=${params.serviceId}`,
+        toFetch.objectType,
+        params.namespace
+      ).catch(this.captureKubernetesErrorsRethrowOthers.bind(this));
     });
     return Promise.all(fetchResults).then(fetchResultsToResponseWrapper);
   }
   fetchPodMetricsByNamespace(clusterDetails, namespace) {
     const metricsClient = this.kubernetesClientProvider.getMetricsClient(clusterDetails);
-    const coreApi = this.kubernetesClientProvider.getCoreClientByClusterDetails(clusterDetails);
+    const coreApi = this.kubernetesClientProvider.getCoreClientByClusterDetails(
+      clusterDetails
+    );
     return clientNode.topPods(coreApi, metricsClient, namespace);
   }
   captureKubernetesErrorsRethrowOthers(e) {
     if (e.response && e.response.statusCode) {
-      this.logger.warn(`statusCode=${e.response.statusCode} for resource ${e.response.request.uri.pathname} body=[${JSON.stringify(e.response.body)}]`);
+      this.logger.warn(
+        `statusCode=${e.response.statusCode} for resource ${e.response.request.uri.pathname} body=[${JSON.stringify(e.response.body)}]`
+      );
       return {
         errorType: statusCodeToErrorType(e.response.statusCode),
         statusCode: e.response.statusCode,
@@ -774,14 +893,33 @@ class KubernetesClientBasedFetcher {
       requestOptions.uri = requestOptions.uri.replace("/apis//v1/", "/api/v1/");
     });
     if (namespace) {
-      return customObjects.listNamespacedCustomObject(resource.group, resource.apiVersion, namespace, resource.plural, "", false, "", "", labelSelector).then((r) => {
+      return customObjects.listNamespacedCustomObject(
+        resource.group,
+        resource.apiVersion,
+        namespace,
+        resource.plural,
+        "",
+        false,
+        "",
+        "",
+        labelSelector
+      ).then((r) => {
         return {
           type: objectType,
           resources: r.body.items
         };
       });
     }
-    return customObjects.listClusterCustomObject(resource.group, resource.apiVersion, resource.plural, "", false, "", "", labelSelector).then((r) => {
+    return customObjects.listClusterCustomObject(
+      resource.group,
+      resource.apiVersion,
+      resource.plural,
+      "",
+      false,
+      "",
+      "",
+      labelSelector
+    ).then((r) => {
       return {
         type: objectType,
         resources: r.body.items
@@ -804,7 +942,9 @@ const addResourceRoutesToRouter = (router, catalogApi, objectsProvider) => {
     } catch (error) {
       throw new errors.InputError(`Invalid entity ref, ${error}`);
     }
-    const token = pluginAuthNode.getBearerTokenFromAuthorizationHeader(req.headers.authorization);
+    const token = pluginAuthNode.getBearerTokenFromAuthorizationHeader(
+      req.headers.authorization
+    );
     if (!token) {
       throw new errors.AuthenticationError("No Backstage token");
     }
@@ -812,7 +952,9 @@ const addResourceRoutesToRouter = (router, catalogApi, objectsProvider) => {
       token
     });
     if (!entity) {
-      throw new errors.InputError(`Entity ref missing, ${catalogModel.stringifyEntityRef(entityRef)}`);
+      throw new errors.InputError(
+        `Entity ref missing, ${catalogModel.stringifyEntityRef(entityRef)}`
+      );
     }
     return entity;
   };
@@ -861,7 +1003,9 @@ class KubernetesBuilder {
       if (process.env.NODE_ENV !== "development") {
         throw new Error("Kubernetes configuration is missing");
       }
-      logger.warn("Failed to initialize kubernetes backend: kubernetes config is missing");
+      logger.warn(
+        "Failed to initialize kubernetes backend: kubernetes config is missing"
+      );
       return {
         router: Router__default["default"]()
       };
@@ -877,7 +1021,11 @@ class KubernetesBuilder {
       customResources,
       objectTypesToFetch: this.getObjectTypesToFetch()
     });
-    const router = this.buildRouter(objectsProvider, clusterSupplier, this.env.catalogApi);
+    const router = this.buildRouter(
+      objectsProvider,
+      clusterSupplier,
+      this.env.catalogApi
+    );
     return {
       clusterSupplier,
       customResources,
@@ -909,18 +1057,26 @@ class KubernetesBuilder {
   }
   buildCustomResources() {
     var _a;
-    const customResources = ((_a = this.env.config.getOptionalConfigArray("kubernetes.customResources")) != null ? _a : []).map((c) => ({
-      group: c.getString("group"),
-      apiVersion: c.getString("apiVersion"),
-      plural: c.getString("plural"),
-      objectType: "customresources"
-    }));
-    this.env.logger.info(`action=LoadingCustomResources numOfCustomResources=${customResources.length}`);
+    const customResources = ((_a = this.env.config.getOptionalConfigArray("kubernetes.customResources")) != null ? _a : []).map(
+      (c) => ({
+        group: c.getString("group"),
+        apiVersion: c.getString("apiVersion"),
+        plural: c.getString("plural"),
+        objectType: "customresources"
+      })
+    );
+    this.env.logger.info(
+      `action=LoadingCustomResources numOfCustomResources=${customResources.length}`
+    );
     return customResources;
   }
   buildClusterSupplier(refreshInterval) {
     const config = this.env.config;
-    return getCombinedClusterSupplier(config, refreshInterval);
+    return getCombinedClusterSupplier(
+      config,
+      this.env.catalogApi,
+      refreshInterval
+    );
   }
   buildObjectsProvider(options) {
     return new KubernetesFanOutHandler(options);
@@ -938,7 +1094,9 @@ class KubernetesBuilder {
       case "http":
         return this.buildHttpServiceLocator(clusterSupplier);
       default:
-        throw new Error(`Unsupported kubernetes.clusterLocatorMethod "${method}"`);
+        throw new Error(
+          `Unsupported kubernetes.clusterLocatorMethod "${method}"`
+        );
     }
   }
   buildMultiTenantServiceLocator(clusterSupplier) {
@@ -961,7 +1119,9 @@ class KubernetesBuilder {
         });
         res.json(response);
       } catch (e) {
-        logger.error(`action=retrieveObjectsByServiceId service=${serviceId}, error=${e}`);
+        logger.error(
+          `action=retrieveObjectsByServiceId service=${serviceId}, error=${e}`
+        );
         res.status(500).json({ error: e.message });
       }
     });
@@ -981,18 +1141,28 @@ class KubernetesBuilder {
   }
   async fetchClusterDetails(clusterSupplier) {
     const clusterDetails = await clusterSupplier.getClusters();
-    this.env.logger.info(`action=loadClusterDetails numOfClustersLoaded=${clusterDetails.length}`);
+    this.env.logger.info(
+      `action=loadClusterDetails numOfClustersLoaded=${clusterDetails.length}`
+    );
     return clusterDetails;
   }
   getServiceLocatorMethod() {
-    return this.env.config.getString("kubernetes.serviceLocatorMethod.type");
+    return this.env.config.getString(
+      "kubernetes.serviceLocatorMethod.type"
+    );
   }
   getObjectTypesToFetch() {
-    const objectTypesToFetchStrings = this.env.config.getOptionalStringArray("kubernetes.objectTypes");
-    const apiVersionOverrides = this.env.config.getOptionalConfig("kubernetes.apiVersionOverrides");
+    const objectTypesToFetchStrings = this.env.config.getOptionalStringArray(
+      "kubernetes.objectTypes"
+    );
+    const apiVersionOverrides = this.env.config.getOptionalConfig(
+      "kubernetes.apiVersionOverrides"
+    );
     let objectTypesToFetch;
     if (objectTypesToFetchStrings) {
-      objectTypesToFetch = DEFAULT_OBJECTS.filter((obj) => objectTypesToFetchStrings.includes(obj.objectType));
+      objectTypesToFetch = DEFAULT_OBJECTS.filter(
+        (obj) => objectTypesToFetchStrings.includes(obj.objectType)
+      );
     }
     if (apiVersionOverrides) {
       objectTypesToFetch = objectTypesToFetch != null ? objectTypesToFetch : DEFAULT_OBJECTS;