From 81304e3e9163f514d43e152828808401c78aef64 Mon Sep 17 00:00:00 2001
From: goenning <me@goenning.net>
Date: Mon, 16 May 2022 16:49:42 +0100
Subject: [PATCH] Fix for HPA matching when deploying same HPA in multiple
 namespaces

Signed-off-by: goenning <me@goenning.net>
---
 .changeset/sixty-plums-kick.md                    |  5 +++++
 .../CustomResources/ArgoRollouts/Rollout.tsx      |  7 +++++--
 .../DeploymentsAccordions.tsx                     |  7 +++++--
 plugins/kubernetes/src/utils/owner.ts             | 15 +++++++++++----
 4 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/sixty-plums-kick.md

diff --git a/.changeset/sixty-plums-kick.md b/.changeset/sixty-plums-kick.md
new file mode 100644
index 0000000000..5c11d9aaca
--- /dev/null
+++ b/.changeset/sixty-plums-kick.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes': patch
+---
+
+Fix for HPA matching when deploying same HPA in multiple namespaces
diff --git a/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/Rollout.tsx b/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/Rollout.tsx
index 52734e39a8..185eeb771e 100644
--- a/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/Rollout.tsx
+++ b/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/Rollout.tsx
@@ -268,8 +268,11 @@ export const RolloutAccordions = ({
             <RolloutAccordion
               defaultExpanded={defaultExpanded}
               matchingHpa={getMatchingHpa(
-                rollout.metadata?.name,
-                'rollout',
+                {
+                  name: rollout.metadata?.name,
+                  namespace: rollout.metadata?.namespace,
+                  kind: 'rollout',
+                },
                 groupedResponses.horizontalPodAutoscalers,
               )}
               ownedPods={getOwnedPodsThroughReplicaSets(
diff --git a/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentsAccordions.tsx b/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentsAccordions.tsx
index 58ab2fc2ba..d2fb6275bc 100644
--- a/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentsAccordions.tsx
+++ b/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentsAccordions.tsx
@@ -186,8 +186,11 @@ export const DeploymentsAccordions = ({}: DeploymentsAccordionsProps) => {
           <Grid item xs>
             <DeploymentAccordion
               matchingHpa={getMatchingHpa(
-                deployment.metadata?.name,
-                'deployment',
+                {
+                  name: deployment.metadata?.name,
+                  namespace: deployment.metadata?.namespace,
+                  kind: 'deployment',
+                },
                 groupedResponses.horizontalPodAutoscalers,
               )}
               ownedPods={getOwnedPodsThroughReplicaSets(
diff --git a/plugins/kubernetes/src/utils/owner.ts b/plugins/kubernetes/src/utils/owner.ts
index b30beb7fad..1c1d8089a3 100644
--- a/plugins/kubernetes/src/utils/owner.ts
+++ b/plugins/kubernetes/src/utils/owner.ts
@@ -54,17 +54,24 @@ export const getOwnedPodsThroughReplicaSets = (
   }, [] as V1Pod[]);
 };
 
+interface ResourceRef {
+  kind: string;
+  namespace?: string;
+  name?: string;
+}
+
 export const getMatchingHpa = (
-  ownerName: string | undefined,
-  ownerKind: string,
+  owner: ResourceRef,
   hpas: V1HorizontalPodAutoscaler[],
 ): V1HorizontalPodAutoscaler | undefined => {
   return hpas.find(hpa => {
     return (
       (hpa.spec?.scaleTargetRef?.kind ?? '').toLocaleLowerCase('en-US') ===
-        ownerKind.toLocaleLowerCase('en-US') &&
+        owner.kind.toLocaleLowerCase('en-US') &&
+      (hpa.metadata?.namespace ?? '') ===
+        (owner.namespace ?? 'unknown-namespace') &&
       (hpa.spec?.scaleTargetRef?.name ?? '') ===
-        (ownerName ?? 'unknown-deployment')
+        (owner.name ?? 'unknown-deployment')
     );
   });
 };