Merge pull request #89142 from zhouya0/fix_printers_ignoring_object_average_value

Fix printers ignoring object average value
This commit is contained in:
Kubernetes Prow Robot 2020-03-26 12:48:23 -07:00 committed by GitHub
commit 8aca6dc710
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1920,11 +1920,19 @@ func formatHPAMetrics(specs []autoscaling.MetricSpec, statuses []autoscaling.Met
}
list = append(list, fmt.Sprintf("%s/%s", current, spec.Pods.Target.AverageValue.String()))
case autoscaling.ObjectMetricSourceType:
current := "<unknown>"
if len(statuses) > i && statuses[i].Object != nil {
current = statuses[i].Object.Current.Value.String()
if spec.Object.Target.AverageValue != nil {
current := "<unknown>"
if len(statuses) > i && statuses[i].Object != nil && statuses[i].Object.Current.AverageValue != nil {
current = statuses[i].Object.Current.AverageValue.String()
}
list = append(list, fmt.Sprintf("%s/%s (avg)", current, spec.Object.Target.AverageValue.String()))
} else {
current := "<unknown>"
if len(statuses) > i && statuses[i].Object != nil {
current = statuses[i].Object.Current.Value.String()
}
list = append(list, fmt.Sprintf("%s/%s", current, spec.Object.Target.Value.String()))
}
list = append(list, fmt.Sprintf("%s/%s", current, spec.Object.Target.Value.String()))
case autoscaling.ResourceMetricSourceType:
if spec.Resource.Target.AverageValue != nil {
current := "<unknown>"