Skip to content

Commit 1cdb4c9

Browse files
authored
Merge pull request kubernetes#74946 from ialidzhikov/clean-ineffectual-assignments
Clean ineffectual assignments
2 parents 92a2076 + c3b2fb0 commit 1cdb4c9

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

pkg/controller/podautoscaler/horizontal.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -553,14 +553,14 @@ func (a *HorizontalController) reconcileAutoscaler(hpav1Shared *autoscalingv1.Ho
553553
currentReplicas := scale.Status.Replicas
554554
a.recordInitialRecommendation(currentReplicas, key)
555555

556-
var metricStatuses []autoscalingv2.MetricStatus
557-
metricDesiredReplicas := int32(0)
558-
metricName := ""
559-
metricTimestamp := time.Time{}
556+
var (
557+
metricStatuses []autoscalingv2.MetricStatus
558+
metricDesiredReplicas int32
559+
metricName string
560+
)
560561

561562
desiredReplicas := int32(0)
562563
rescaleReason := ""
563-
timestamp := time.Now()
564564

565565
rescale := true
566566

@@ -579,7 +579,7 @@ func (a *HorizontalController) reconcileAutoscaler(hpav1Shared *autoscalingv1.Ho
579579
rescaleReason = "Current number of replicas must be greater than 0"
580580
desiredReplicas = 1
581581
} else {
582-
582+
var metricTimestamp time.Time
583583
metricDesiredReplicas, metricName, metricStatuses, metricTimestamp, err = a.computeReplicasForMetrics(hpa, scale, hpa.Spec.Metrics)
584584
if err != nil {
585585
a.setCurrentReplicasInStatus(hpa, currentReplicas)
@@ -590,12 +590,11 @@ func (a *HorizontalController) reconcileAutoscaler(hpav1Shared *autoscalingv1.Ho
590590
return fmt.Errorf("failed to compute desired number of replicas based on listed metrics for %s: %v", reference, err)
591591
}
592592

593-
klog.V(4).Infof("proposing %v desired replicas (based on %s from %s) for %s", metricDesiredReplicas, metricName, timestamp, reference)
593+
klog.V(4).Infof("proposing %v desired replicas (based on %s from %s) for %s", metricDesiredReplicas, metricName, metricTimestamp, reference)
594594

595595
rescaleMetric := ""
596596
if metricDesiredReplicas > desiredReplicas {
597597
desiredReplicas = metricDesiredReplicas
598-
timestamp = metricTimestamp
599598
rescaleMetric = metricName
600599
}
601600
if desiredReplicas > currentReplicas {

0 commit comments

Comments
 (0)