Merge pull request #5053 from shoebsd31/master

#5051 entity name updated
backstage · Mar 30, 2021 · bd90c8f · bd90c8f
2 parents 1ba5d52 + 9b813eb
commit bd90c8f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.changeset/gorgeous-meals-tie.md b/.changeset/gorgeous-meals-tie.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes-backend': patch
+---
+
+updated entity name to be set through annotations or fallback
diff --git a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts
@@ -58,7 +58,10 @@ export class KubernetesFanOutHandler {
     requestBody: KubernetesRequestBody,
     objectTypesToFetch: Set<KubernetesObjectTypes> = DEFAULT_OBJECTS,
   ) {
-    const entityName = requestBody.entity.metadata.name;
+    const entityName =
+      requestBody.entity?.metadata?.annotations?.[
+        'backstage.io/kubernetes-id'
+      ] || requestBody.entity?.metadata?.name;
 
     const clusterDetails: ClusterDetails[] = await this.serviceLocator.getClustersByServiceId(
       entityName,