Merge pull request #5317 from grosser/grosser/ref2

cluster-autoscaler: refactor BalanceScaleUpBetweenGroups
kubernetes · Dec 19, 2022 · d9ffb8f · d9ffb8f
2 parents a46a095 + 62f29d2
commit d9ffb8f
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/cluster-autoscaler/processors/nodegroupset/balancing_processor.go b/cluster-autoscaler/processors/nodegroupset/balancing_processor.go
@@ -97,15 +97,16 @@ func (b *BalancingNodeGroupSetProcessor) BalanceScaleUpBetweenGroups(context *co
 			// group already maxed, ignore it
 			continue
 		}
-		info := ScaleUpInfo{
+		if maxSize > currentSize {
+			// we still have capacity to expand
+			totalCapacity += (maxSize - currentSize)
+		}
+		scaleUpInfos = append(scaleUpInfos, ScaleUpInfo{
 			Group:       ng,
 			CurrentSize: currentSize,
 			NewSize:     currentSize,
-			MaxSize:     maxSize}
-		scaleUpInfos = append(scaleUpInfos, info)
-		if maxSize-currentSize > 0 {
-			totalCapacity += maxSize - currentSize
-		}
+			MaxSize:     maxSize,
+		})
 	}
 	if totalCapacity < newNodes {
 		klog.V(2).Infof("Requested scale-up (%v) exceeds node group set capacity, capping to %v", newNodes, totalCapacity)