From ad9b3f3c2746000fc15eb248d5aaa2d280c0ed2d Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Sat, 3 Aug 2019 14:17:51 -0400 Subject: [PATCH] fix(kubernetes/v1): set currentCpuUtilization from currentMetrics (#3912) (#3914) * fix(kubernetes/v1): remove currentCPUUtilization, does not exist in fabric8:4.1.1 * fix(kubernetes/v1): remove currentCPUUtilizationPercentage * fix(kubernetes/v1): set currentCpuUtilization from currentMetrics --- .../kubernetes/v1/model/KubernetesAutoscalerStatus.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/model/KubernetesAutoscalerStatus.groovy b/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/model/KubernetesAutoscalerStatus.groovy index e5c2302a6a6..58ffcc79ca6 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/model/KubernetesAutoscalerStatus.groovy +++ b/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/model/KubernetesAutoscalerStatus.groovy @@ -22,7 +22,6 @@ import groovy.util.logging.Slf4j @Slf4j class KubernetesAutoscalerStatus { - Integer currentCpuUtilization Integer currentReplicas Integer desiredReplicas Long lastScaleTime @@ -33,7 +32,7 @@ class KubernetesAutoscalerStatus { if (autoscaler.status == null) { log.warn("Autoscaler on ${autoscaler.metadata.name} has a null status. The replicaset may be missing a CPU request.") } else { - this.currentCpuUtilization = autoscaler.status.currentCPUUtilizationPercentage + this.currentCpuUtilization = autoscaler.status.currentMetrics?.find { metric -> metric.resource.name == "cpu" }?.resource?.currentAverageUtilization this.currentReplicas = autoscaler.status.currentReplicas this.desiredReplicas = autoscaler.status.desiredReplicas this.lastScaleTime = KubernetesModelUtil.translateTime(autoscaler.status.lastScaleTime)