From c3b2fb0d111238b6cdf5e408a00be0a6ed9d5432 Mon Sep 17 00:00:00 2001 From: ialidzhikov Date: Tue, 5 Mar 2019 10:05:18 +0200 Subject: [PATCH] Clean ineffectual assignments Signed-off-by: ialidzhikov --- pkg/controller/podautoscaler/horizontal.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkg/controller/podautoscaler/horizontal.go b/pkg/controller/podautoscaler/horizontal.go index c6a31532f19..a6f8cc14419 100644 --- a/pkg/controller/podautoscaler/horizontal.go +++ b/pkg/controller/podautoscaler/horizontal.go @@ -553,14 +553,14 @@ func (a *HorizontalController) reconcileAutoscaler(hpav1Shared *autoscalingv1.Ho currentReplicas := scale.Status.Replicas a.recordInitialRecommendation(currentReplicas, key) - var metricStatuses []autoscalingv2.MetricStatus - metricDesiredReplicas := int32(0) - metricName := "" - metricTimestamp := time.Time{} + var ( + metricStatuses []autoscalingv2.MetricStatus + metricDesiredReplicas int32 + metricName string + ) desiredReplicas := int32(0) rescaleReason := "" - timestamp := time.Now() rescale := true @@ -579,7 +579,7 @@ func (a *HorizontalController) reconcileAutoscaler(hpav1Shared *autoscalingv1.Ho rescaleReason = "Current number of replicas must be greater than 0" desiredReplicas = 1 } else { - + var metricTimestamp time.Time metricDesiredReplicas, metricName, metricStatuses, metricTimestamp, err = a.computeReplicasForMetrics(hpa, scale, hpa.Spec.Metrics) if err != nil { a.setCurrentReplicasInStatus(hpa, currentReplicas) @@ -590,12 +590,11 @@ func (a *HorizontalController) reconcileAutoscaler(hpav1Shared *autoscalingv1.Ho return fmt.Errorf("failed to compute desired number of replicas based on listed metrics for %s: %v", reference, err) } - klog.V(4).Infof("proposing %v desired replicas (based on %s from %s) for %s", metricDesiredReplicas, metricName, timestamp, reference) + klog.V(4).Infof("proposing %v desired replicas (based on %s from %s) for %s", metricDesiredReplicas, metricName, metricTimestamp, reference) rescaleMetric := "" if metricDesiredReplicas > desiredReplicas { desiredReplicas = metricDesiredReplicas - timestamp = metricTimestamp rescaleMetric = metricName } if desiredReplicas > currentReplicas {