From b7f620f3f0657cd1dfe6bd8f6d4f458b6a546b16 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 4 Aug 2022 11:21:01 -0700
Subject: [PATCH] Correctly handle HorizontalPodAutoscaler metrics with 0 usage
 (#5986)

(cherry picked from commit 8dea3ad8bc56f7e65303aff1ac7325ca49546c0f)
---
 .../k8s-api/endpoints/horizontal-pod-autoscaler.api.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/common/k8s-api/endpoints/horizontal-pod-autoscaler.api.ts b/src/common/k8s-api/endpoints/horizontal-pod-autoscaler.api.ts
index 8c288b1272..70857fd881 100644
--- a/src/common/k8s-api/endpoints/horizontal-pod-autoscaler.api.ts
+++ b/src/common/k8s-api/endpoints/horizontal-pod-autoscaler.api.ts
@@ -210,8 +210,6 @@ export class HorizontalPodAutoscalerApi extends KubeApi<HorizontalPodAutoscaler>
   }
 }
 
-
-
 function getMetricName(metric: HorizontalPodAutoscalerMetricSpec | HorizontalPodAutoscalerMetricStatus): string | undefined {
   switch (metric.type) {
     case HpaMetricType.Resource:
@@ -232,12 +230,12 @@ function getMetricName(metric: HorizontalPodAutoscalerMetricSpec | HorizontalPod
 function getResourceMetricValue(currentMetric: ResourceMetricStatus | undefined, targetMetric: ResourceMetricSource): MetricCurrentTarget {
   return {
     current: (
-      currentMetric?.currentAverageUtilization
+      typeof currentMetric?.currentAverageUtilization === "number"
         ? `${currentMetric.currentAverageUtilization}%`
         : currentMetric?.currentAverageValue
     ),
     target: (
-      targetMetric?.targetAverageUtilization
+      typeof targetMetric?.targetAverageUtilization === "number"
         ? `${targetMetric.targetAverageUtilization}%`
         : targetMetric?.targetAverageValue
     ),
@@ -280,12 +278,12 @@ function getExternalMetricValue(currentMetric: ExternalMetricStatus | undefined,
 function getContainerResourceMetricValue(currentMetric: ContainerResourceMetricStatus | undefined, targetMetric: ContainerResourceMetricSource): MetricCurrentTarget {
   return {
     current: (
-      currentMetric?.currentAverageUtilization
+      typeof currentMetric?.currentAverageUtilization === "number"
         ? `${currentMetric.currentAverageUtilization}%`
         : currentMetric?.currentAverageValue
     ),
     target: (
-      targetMetric?.targetAverageUtilization
+      typeof targetMetric?.targetAverageUtilization === "number"
         ? `${targetMetric.targetAverageUtilization}%`
         : targetMetric?.targetAverageValue
     ),