From 2267722ae156d38d0bdfc61df84e1a0425a47226 Mon Sep 17 00:00:00 2001 From: shoeb Date: Mon, 22 Mar 2021 13:48:26 +0100 Subject: [PATCH 1/7] #5051 entity name updated Signed-off-by: shoeb --- .../kubernetes-backend/src/service/KubernetesFanOutHandler.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts index 9427ce9553..2caffc1d91 100644 --- a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts +++ b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts @@ -58,7 +58,9 @@ export class KubernetesFanOutHandler { requestBody: KubernetesRequestBody, objectTypesToFetch: Set = DEFAULT_OBJECTS, ) { - const entityName = requestBody.entity.metadata.name; + const entityName = requestBody.entity?.metadata?.annotations?.[ + 'backstage.io/kubernetes-label-selector' + ]; const clusterDetails: ClusterDetails[] = await this.serviceLocator.getClustersByServiceId( entityName, From bb714e924645163762a9680208693f3a7bf2db57 Mon Sep 17 00:00:00 2001 From: shoeb Date: Mon, 22 Mar 2021 14:42:08 +0100 Subject: [PATCH 2/7] executed prettier Signed-off-by: shoeb --- .../src/service/KubernetesFanOutHandler.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts index 2caffc1d91..1cfe93fd45 100644 --- a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts +++ b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts @@ -58,9 +58,10 @@ export class KubernetesFanOutHandler { requestBody: KubernetesRequestBody, objectTypesToFetch: Set = DEFAULT_OBJECTS, ) { - const entityName = requestBody.entity?.metadata?.annotations?.[ - 'backstage.io/kubernetes-label-selector' - ]; + const entityName = + requestBody.entity?.metadata?.annotations?.[ + 'backstage.io/kubernetes-label-selector' + ]; const clusterDetails: ClusterDetails[] = await this.serviceLocator.getClustersByServiceId( entityName, From 731759ac745590bfe871addf1c82c6ec71f23d82 Mon Sep 17 00:00:00 2001 From: shoeb Date: Mon, 22 Mar 2021 15:32:42 +0100 Subject: [PATCH 3/7] appended entity.metadata.name Signed-off-by: shoeb --- .../kubernetes-backend/src/service/KubernetesFanOutHandler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts index 1cfe93fd45..e8ce185fcd 100644 --- a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts +++ b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts @@ -61,7 +61,7 @@ export class KubernetesFanOutHandler { const entityName = requestBody.entity?.metadata?.annotations?.[ 'backstage.io/kubernetes-label-selector' - ]; + ] || `backstage.io/kubernetes-id=${requestBody.entity?.metadata?.name}`; const clusterDetails: ClusterDetails[] = await this.serviceLocator.getClustersByServiceId( entityName, From 81ea05c33c49cea368f8400ff5987d2435e213a4 Mon Sep 17 00:00:00 2001 From: shoeb Date: Fri, 26 Mar 2021 09:53:12 +0100 Subject: [PATCH 4/7] updated entityname to get kuernetes-id from annotations or fallback Signed-off-by: shoeb --- .../kubernetes-backend/src/service/KubernetesFanOutHandler.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts index e8ce185fcd..6db6e2ad4a 100644 --- a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts +++ b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts @@ -60,8 +60,8 @@ export class KubernetesFanOutHandler { ) { const entityName = requestBody.entity?.metadata?.annotations?.[ - 'backstage.io/kubernetes-label-selector' - ] || `backstage.io/kubernetes-id=${requestBody.entity?.metadata?.name}`; + 'backstage.io/kubernetes-id' + ] || requestBody.entity?.metadata?.name; const clusterDetails: ClusterDetails[] = await this.serviceLocator.getClustersByServiceId( entityName, From 1ac6a5233c9897cce56442d7c16e4a7392083038 Mon Sep 17 00:00:00 2001 From: shoeb Date: Fri, 26 Mar 2021 19:39:09 +0100 Subject: [PATCH 5/7] updated changeset Signed-off-by: shoeb --- .changeset/gorgeous-meals-tie.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/gorgeous-meals-tie.md diff --git a/.changeset/gorgeous-meals-tie.md b/.changeset/gorgeous-meals-tie.md new file mode 100644 index 0000000000..245d6566e3 --- /dev/null +++ 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 From de55be8a4fedce4ea37844b160e371382af8fa78 Mon Sep 17 00:00:00 2001 From: shoeb Date: Mon, 29 Mar 2021 19:18:41 +0200 Subject: [PATCH 6/7] rebased with master and re-created changeset Signed-off-by: shoeb --- .changeset/large-rockets-ring.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/large-rockets-ring.md diff --git a/.changeset/large-rockets-ring.md b/.changeset/large-rockets-ring.md new file mode 100644 index 0000000000..34ec35230e --- /dev/null +++ b/.changeset/large-rockets-ring.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-kafka-backend': minor +--- + +updated with the latest master and commiting with updated entityname in kubernetes backend plugin From 9b813eb90c716e673760e54dc74fedc0cf7f308d Mon Sep 17 00:00:00 2001 From: shoeb Date: Tue, 30 Mar 2021 09:28:41 +0200 Subject: [PATCH 7/7] removed the other changesets and kept gorgeous-meals-tie.md in changeset Signed-off-by: shoeb --- .changeset/large-rockets-ring.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .changeset/large-rockets-ring.md diff --git a/.changeset/large-rockets-ring.md b/.changeset/large-rockets-ring.md deleted file mode 100644 index 34ec35230e..0000000000 --- a/.changeset/large-rockets-ring.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-kafka-backend': minor ---- - -updated with the latest master and commiting with updated entityname in kubernetes backend plugin