Add new fields to getcluster method in catalogclusterconfig and remove deprecated imports

Signed-off-by: Ruben Vallejo <rvallejo@gmail.com>

packages/catalog-model/api-report.md

@@ -14,14 +14,14 @@ export interface AlphaEntity extends Entity {
 // @public
 export const ANNOTATION_EDIT_URL = 'backstage.io/edit-url';
 
-// @public
+// @public @deprecated
 export const ANNOTATION_KUBERNETES_API_SERVER = 'kubernetes.io/api-server';
 
-// @public
+// @public @deprecated
 export const ANNOTATION_KUBERNETES_API_SERVER_CA =
   'kubernetes.io/api-server-certificate-authority';
 
-// @public
+// @public @deprecated
 export const ANNOTATION_KUBERNETES_AUTH_PROVIDER =
   'kubernetes.io/auth-provider';
 

packages/catalog-model/src/entity/index.ts

@@ -15,14 +15,7 @@
  */
 
 export * from './conditions';
-export {
-  DEFAULT_NAMESPACE,
-  ANNOTATION_EDIT_URL,
-  ANNOTATION_VIEW_URL,
-  ANNOTATION_KUBERNETES_API_SERVER,
-  ANNOTATION_KUBERNETES_API_SERVER_CA,
-  ANNOTATION_KUBERNETES_AUTH_PROVIDER,
-} from './constants';
+export * from './constants';
 export type {
   AlphaEntity,
   Entity,

plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.ts

@@ -20,7 +20,12 @@ import {
   ANNOTATION_KUBERNETES_API_SERVER,
   ANNOTATION_KUBERNETES_API_SERVER_CA,
   ANNOTATION_KUBERNETES_AUTH_PROVIDER,
-} from '@backstage/catalog-model';
+  ANNOTATION_KUBERNETES_OIDC_TOKEN_PROVIDER,
+  ANNOTATION_KUBERNETES_SKIP_METRICS_LOOKUP,
+  ANNOTATION_KUBERNETES_SKIP_TLS_VERIFY,
+  ANNOTATION_KUBERNETES_DASHBOARD_URL,
+  ANNOTATION_KUBERNETES_DASHBOARD_APP,
+} from '@backstage/plugin-kubernetes-common';
 
 export class CatalogClusterLocator implements KubernetesClustersSupplier {
   private catalogClient: CatalogApi;
@@ -57,6 +62,26 @@ export class CatalogClusterLocator implements KubernetesClustersSupplier {
           entity.metadata.annotations![ANNOTATION_KUBERNETES_API_SERVER_CA]!,
         authProvider:
           entity.metadata.annotations![ANNOTATION_KUBERNETES_AUTH_PROVIDER]!,
+        oidcTokenProvider:
+          entity.metadata.annotations![
+            ANNOTATION_KUBERNETES_OIDC_TOKEN_PROVIDER
+          ]!,
+        skipMetricsLookup:
+          entity.metadata.annotations![
+            ANNOTATION_KUBERNETES_SKIP_METRICS_LOOKUP
+          ]! === 'true'
+            ? true
+            : false,
+        skipTLSVerify:
+          entity.metadata.annotations![
+            ANNOTATION_KUBERNETES_SKIP_TLS_VERIFY
+          ]! === 'true'
+            ? true
+            : false,
+        dashboardUrl:
+          entity.metadata.annotations![ANNOTATION_KUBERNETES_DASHBOARD_URL]!,
+        dashboardApp:
+          entity.metadata.annotations![ANNOTATION_KUBERNETES_DASHBOARD_APP]!,
       };
 
       return clusterDetails;

plugins/kubernetes-common/api-report.md

@@ -19,6 +19,37 @@ import { V1ReplicaSet } from '@kubernetes/client-node';
 import { V1Service } from '@kubernetes/client-node';
 import { V1StatefulSet } from '@kubernetes/client-node';
 
+// @public
+export const ANNOTATION_KUBERNETES_API_SERVER = 'kubernetes.io/api-server';
+
+// @public
+export const ANNOTATION_KUBERNETES_API_SERVER_CA =
+  'kubernetes.io/api-server-certificate-authority';
+
+// @public
+export const ANNOTATION_KUBERNETES_AUTH_PROVIDER =
+  'kubernetes.io/auth-provider';
+
+// @public
+export const ANNOTATION_KUBERNETES_DASHBOARD_APP =
+  'kubernetes.io/dashboard-app';
+
+// @public
+export const ANNOTATION_KUBERNETES_DASHBOARD_URL =
+  'kubernetes.io/dashboard-url';
+
+// @public
+export const ANNOTATION_KUBERNETES_OIDC_TOKEN_PROVIDER =
+  'kubernetes.io/oidc-token-provider';
+
+// @public
+export const ANNOTATION_KUBERNETES_SKIP_METRICS_LOOKUP =
+  'kubernetes.io/skip-metrics-lookup';
+
+// @public
+export const ANNOTATION_KUBERNETES_SKIP_TLS_VERIFY =
+  'kubernetes.io/skip-tls-verify';
+
 // @public (undocumented)
 export type AuthProviderType = 'google' | 'serviceAccount' | 'aws' | 'azure';