From 6a051b94e7fe767f634ba634ed46bd565e55771e Mon Sep 17 00:00:00 2001 From: zhouya0 Date: Mon, 16 Mar 2020 11:59:24 +0800 Subject: [PATCH] Fix printers ignoring object average value --- pkg/printers/internalversion/printers.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkg/printers/internalversion/printers.go b/pkg/printers/internalversion/printers.go index fabba32196d..7f1816e6981 100644 --- a/pkg/printers/internalversion/printers.go +++ b/pkg/printers/internalversion/printers.go @@ -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 := "" - if len(statuses) > i && statuses[i].Object != nil { - current = statuses[i].Object.Current.Value.String() + if spec.Object.Target.AverageValue != nil { + current := "" + 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 := "" + 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 := ""