From 12a784b46bd7ba03beda3b4b2c979f03799f068f Mon Sep 17 00:00:00 2001 From: kincoy Date: Thu, 28 Aug 2025 14:28:55 +0800 Subject: [PATCH] cleanup: remove redundant type conversions in podautoscaler Signed-off-by: kincoy --- pkg/controller/podautoscaler/horizontal_test.go | 4 ++-- pkg/controller/podautoscaler/metrics/client.go | 2 +- pkg/controller/podautoscaler/metrics/client_test.go | 2 +- pkg/controller/podautoscaler/replica_calculator.go | 2 +- pkg/controller/podautoscaler/replica_calculator_test.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/controller/podautoscaler/horizontal_test.go b/pkg/controller/podautoscaler/horizontal_test.go index 1c9070c15ba..475e1a3c534 100644 --- a/pkg/controller/podautoscaler/horizontal_test.go +++ b/pkg/controller/podautoscaler/horizontal_test.go @@ -93,7 +93,7 @@ func statusOkWithOverrides(overrides ...autoscalingv2.HorizontalPodAutoscalerCon resv1 := make([]autoscalingv2.HorizontalPodAutoscalerCondition, len(resv2)) for i, cond := range resv2 { resv1[i] = autoscalingv2.HorizontalPodAutoscalerCondition{ - Type: autoscalingv2.HorizontalPodAutoscalerConditionType(cond.Type), + Type: cond.Type, Status: cond.Status, Reason: cond.Reason, } @@ -4003,7 +4003,7 @@ func TestCalculateScaleDownLimitWithBehaviors(t *testing.T) { func generateScalingRules(pods, podsPeriod, percent, percentPeriod, stabilizationWindow int32) *autoscalingv2.HPAScalingRules { policy := autoscalingv2.MaxChangePolicySelect directionBehavior := autoscalingv2.HPAScalingRules{ - StabilizationWindowSeconds: ptr.To(int32(stabilizationWindow)), + StabilizationWindowSeconds: ptr.To(stabilizationWindow), SelectPolicy: &policy, } if pods != 0 { diff --git a/pkg/controller/podautoscaler/metrics/client.go b/pkg/controller/podautoscaler/metrics/client.go index 90c54f1e4c6..437f5337b3a 100644 --- a/pkg/controller/podautoscaler/metrics/client.go +++ b/pkg/controller/podautoscaler/metrics/client.go @@ -159,7 +159,7 @@ func (c *customMetricsClient) GetRawMetric(metricName string, namespace string, res[m.DescribedObject.Name] = PodMetric{ Timestamp: m.Timestamp.Time, Window: window, - Value: int64(m.Value.MilliValue()), + Value: m.Value.MilliValue(), } } diff --git a/pkg/controller/podautoscaler/metrics/client_test.go b/pkg/controller/podautoscaler/metrics/client_test.go index 59fbcc804aa..cf81d20fa92 100644 --- a/pkg/controller/podautoscaler/metrics/client_test.go +++ b/pkg/controller/podautoscaler/metrics/client_test.go @@ -241,7 +241,7 @@ func (tc *restClientTestCase) runTest(t *testing.T) { isResource := len(tc.resourceName) > 0 isExternal := tc.metricSelector != nil if isResource { - info, timestamp, err := metricsClient.GetResourceMetric(context.TODO(), v1.ResourceName(tc.resourceName), tc.namespace, tc.selector, tc.container) + info, timestamp, err := metricsClient.GetResourceMetric(context.TODO(), tc.resourceName, tc.namespace, tc.selector, tc.container) tc.verifyResults(t, info, timestamp, err) } else if isExternal { tc.metricLabelSelector, err = metav1.LabelSelectorAsSelector(tc.metricSelector) diff --git a/pkg/controller/podautoscaler/replica_calculator.go b/pkg/controller/podautoscaler/replica_calculator.go index ea83a5112f1..49f68ae0c4e 100644 --- a/pkg/controller/podautoscaler/replica_calculator.go +++ b/pkg/controller/podautoscaler/replica_calculator.go @@ -185,7 +185,7 @@ func (c *ReplicaCalculator) GetMetricReplicas(currentReplicas int32, targetUsage return 0, 0, time.Time{}, fmt.Errorf("unable to get metric %s: %v", metricName, err) } - replicaCount, usage, err = c.calcPlainMetricReplicas(metrics, currentReplicas, targetUsage, tolerances, namespace, selector, v1.ResourceName("")) + replicaCount, usage, err = c.calcPlainMetricReplicas(metrics, currentReplicas, targetUsage, tolerances, namespace, selector, "") return replicaCount, usage, timestamp, err } diff --git a/pkg/controller/podautoscaler/replica_calculator_test.go b/pkg/controller/podautoscaler/replica_calculator_test.go index fd406d66102..202bce959d4 100644 --- a/pkg/controller/podautoscaler/replica_calculator_test.go +++ b/pkg/controller/podautoscaler/replica_calculator_test.go @@ -287,7 +287,7 @@ func (tc *replicaCalcTestCase) prepareTestCMClient(t *testing.T) *cmfake.FakeCus Metric: cmapi.MetricIdentifier{ Name: tc.metric.name, }, - Value: *resource.NewMilliQuantity(int64(tc.metric.levels[0]), resource.DecimalSI), + Value: *resource.NewMilliQuantity(tc.metric.levels[0], resource.DecimalSI), }, }