From 6009d2aabcc96b5b4e8cbb5e8f857a61684fc00c Mon Sep 17 00:00:00 2001 From: Jamie Klassen Date: Mon, 22 Jan 2024 10:48:38 -0500 Subject: [PATCH] CatalogClusterLocator reads title Signed-off-by: Jamie Klassen --- .changeset/thin-turtles-float.md | 5 +++++ .../src/cluster-locator/CatalogClusterLocator.test.ts | 1 + .../src/cluster-locator/CatalogClusterLocator.ts | 1 + .../__snapshots__/CatalogClusterLocator.test.ts.snap | 2 ++ 4 files changed, 9 insertions(+) create mode 100644 .changeset/thin-turtles-float.md diff --git a/.changeset/thin-turtles-float.md b/.changeset/thin-turtles-float.md new file mode 100644 index 0000000000..7416093e17 --- /dev/null +++ b/.changeset/thin-turtles-float.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-kubernetes-backend': patch +--- + +Clusters in the catalog can now specify a human-readable title via `metadata.title`. diff --git a/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.test.ts b/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.test.ts index ad09f52f0a..d6bc64221d 100644 --- a/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.test.ts +++ b/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.test.ts @@ -43,6 +43,7 @@ const mockCatalogApi = { 'kubernetes.io/dashboard-app': 'my-app', }, name: 'owned', + title: 'title', namespace: 'default', }, }, diff --git a/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.ts b/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.ts index 9be4cd39cc..a2c5f0376a 100644 --- a/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.ts +++ b/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.ts @@ -63,6 +63,7 @@ export class CatalogClusterLocator implements KubernetesClustersSupplier { const annotations = entity.metadata.annotations!; const clusterDetails: ClusterDetails = { name: entity.metadata.name, + title: entity.metadata.title, url: annotations[ANNOTATION_KUBERNETES_API_SERVER], authMetadata: annotations, caData: annotations[ANNOTATION_KUBERNETES_API_SERVER_CA], diff --git a/plugins/kubernetes-backend/src/cluster-locator/__snapshots__/CatalogClusterLocator.test.ts.snap b/plugins/kubernetes-backend/src/cluster-locator/__snapshots__/CatalogClusterLocator.test.ts.snap index b3731f1c08..f8b3e71515 100644 --- a/plugins/kubernetes-backend/src/cluster-locator/__snapshots__/CatalogClusterLocator.test.ts.snap +++ b/plugins/kubernetes-backend/src/cluster-locator/__snapshots__/CatalogClusterLocator.test.ts.snap @@ -19,6 +19,7 @@ exports[`CatalogClusterLocator returns the aws cluster details provided by annot "name": "owned", "skipMetricsLookup": false, "skipTLSVerify": false, + "title": undefined, "url": "https://apiserver.com", } `; @@ -42,6 +43,7 @@ exports[`CatalogClusterLocator returns the cluster details provided by annotatio "name": "owned", "skipMetricsLookup": true, "skipTLSVerify": true, + "title": "title", "url": "https://apiserver.com", } `;