From c1256e38be4921dacbee935b8c049d80e0c5b7d2 Mon Sep 17 00:00:00 2001 From: jahnavigajjala3-commits Date: Sat, 18 Jul 2026 12:04:48 +0530 Subject: [PATCH 1/2] Replace duplicate intMax helpers with builtin max --- pkg/reconciler/autoscaling/hpa/hpa.go | 11 ++--------- pkg/reconciler/autoscaling/kpa/kpa.go | 11 ++--------- pkg/reconciler/autoscaling/kpa/scaler.go | 8 ++++---- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/pkg/reconciler/autoscaling/hpa/hpa.go b/pkg/reconciler/autoscaling/hpa/hpa.go index ba8cea900577..5246c8a8445f 100644 --- a/pkg/reconciler/autoscaling/hpa/hpa.go +++ b/pkg/reconciler/autoscaling/hpa/hpa.go @@ -118,9 +118,9 @@ func activeThreshold(ctx context.Context, pa *autoscalingv1alpha1.PodAutoscaler) min, _ := pa.ScaleBounds(asConfig) if !pa.Status.IsScaleTargetInitialized() { initialScale := getInitialScale(asConfig, pa) - return intMax(min, initialScale) + return max(min, initialScale) } - return intMax(min, 1) + return max(min, 1) } // getInitialScale returns the calculated initial scale based on the autoscaler @@ -133,10 +133,3 @@ func getInitialScale(asConfig *autoscalerconfig.Config, pa *autoscalingv1alpha1. } return revisionInitialScale } - -func intMax(a, b int32) int32 { - if a < b { - return b - } - return a -} diff --git a/pkg/reconciler/autoscaling/kpa/kpa.go b/pkg/reconciler/autoscaling/kpa/kpa.go index 1914c9512d57..05ca47b07c69 100644 --- a/pkg/reconciler/autoscaling/kpa/kpa.go +++ b/pkg/reconciler/autoscaling/kpa/kpa.go @@ -327,9 +327,9 @@ func activeThreshold(ctx context.Context, pa *autoscalingv1alpha1.PodAutoscaler) min, _ := pa.ScaleBounds(asConfig) if !pa.Status.IsScaleTargetInitialized() { initialScale := resources.GetInitialScale(asConfig, pa) - return int(intMax(min, initialScale)) + return int(max(min, initialScale)) } - return int(intMax(min, 1)) + return int(max(min, 1)) } // resolveScrapeTarget returns metric service name to be scraped based on TBC configuration @@ -351,13 +351,6 @@ func resolveTBC(ctx context.Context, pa *autoscalingv1alpha1.PodAutoscaler) floa return config.FromContext(ctx).Autoscaler.TargetBurstCapacity } -func intMax(a, b int32) int32 { - if a < b { - return b - } - return a -} - func computeNumActivators(readyPods int, decider *scaling.Decider) int32 { if decider.Spec.TargetBurstCapacity == 0 { return int32(minActivators) diff --git a/pkg/reconciler/autoscaling/kpa/scaler.go b/pkg/reconciler/autoscaling/kpa/scaler.go index d542c73e8d9a..3392593adf07 100644 --- a/pkg/reconciler/autoscaling/kpa/scaler.go +++ b/pkg/reconciler/autoscaling/kpa/scaler.go @@ -338,11 +338,11 @@ func (ks *scaler) scale(ctx context.Context, pa *autoscalingv1alpha1.PodAutoscal return desiredScale, nil } - min, max := pa.ScaleBounds(asConfig) + min, maxScale := pa.ScaleBounds(asConfig) initialScale := kparesources.GetInitialScale(asConfig, pa) // Log reachability as quoted string, since default value is "". logger.Debugf("MinScale = %d, MaxScale = %d, InitialScale = %d, DesiredScale = %d Reachable = %q", - min, max, initialScale, desiredScale, pa.Spec.Reachability) + min, maxScale, initialScale, desiredScale, pa.Spec.Reachability) // If initial scale has been attained, ignore the initialScale altogether. // Also ignore initialScale if the revision is unreachable (routingState = "reserve"), // allowing it to scale down to 0 immediately. @@ -351,9 +351,9 @@ func (ks *scaler) scale(ctx context.Context, pa *autoscalingv1alpha1.PodAutoscal if min < initialScale { logger.Debugf("Adjusting min to meet the initial scale: %d -> %d", min, initialScale) } - min = intMax(initialScale, min) + min = max(initialScale, min) } - if newScale := applyBounds(min, max, desiredScale); newScale != desiredScale { + if newScale := applyBounds(min, maxScale, desiredScale); newScale != desiredScale { logger.Debugf("Adjusting desiredScale to meet the min and max bounds before applying: %d -> %d", desiredScale, newScale) desiredScale = newScale } From 09397af37ab65e11b996be1edbfb451291a50d03 Mon Sep 17 00:00:00 2001 From: jahnavigajjala3-commits Date: Sat, 18 Jul 2026 15:29:18 +0530 Subject: [PATCH 2/2] Rename min to minScale to avoid shadowing builtin --- pkg/reconciler/autoscaling/kpa/scaler.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/reconciler/autoscaling/kpa/scaler.go b/pkg/reconciler/autoscaling/kpa/scaler.go index 3392593adf07..6ec0d64948e1 100644 --- a/pkg/reconciler/autoscaling/kpa/scaler.go +++ b/pkg/reconciler/autoscaling/kpa/scaler.go @@ -338,22 +338,22 @@ func (ks *scaler) scale(ctx context.Context, pa *autoscalingv1alpha1.PodAutoscal return desiredScale, nil } - min, maxScale := pa.ScaleBounds(asConfig) + minScale, maxScale := pa.ScaleBounds(asConfig) initialScale := kparesources.GetInitialScale(asConfig, pa) // Log reachability as quoted string, since default value is "". logger.Debugf("MinScale = %d, MaxScale = %d, InitialScale = %d, DesiredScale = %d Reachable = %q", - min, maxScale, initialScale, desiredScale, pa.Spec.Reachability) + minScale, maxScale, initialScale, desiredScale, pa.Spec.Reachability) // If initial scale has been attained, ignore the initialScale altogether. // Also ignore initialScale if the revision is unreachable (routingState = "reserve"), // allowing it to scale down to 0 immediately. if initialScale > 1 && !pa.Status.IsScaleTargetInitialized() && pa.Spec.Reachability != autoscalingv1alpha1.ReachabilityUnreachable { // Ignore initial scale if minScale >= initialScale. - if min < initialScale { - logger.Debugf("Adjusting min to meet the initial scale: %d -> %d", min, initialScale) + if minScale < initialScale { + logger.Debugf("Adjusting minScale to meet the initial scale: %d -> %d", minScale, initialScale) } - min = max(initialScale, min) + minScale = max(initialScale, minScale) } - if newScale := applyBounds(min, maxScale, desiredScale); newScale != desiredScale { + if newScale := applyBounds(minScale, maxScale, desiredScale); newScale != desiredScale { logger.Debugf("Adjusting desiredScale to meet the min and max bounds before applying: %d -> %d", desiredScale, newScale) desiredScale = newScale }