Merge pull request #47 from frobware/fix-bz-1670695-v2

UPSTREAM: <carry>: fix max cluster size calculation on scale up
openshift · Mar 7, 2019 · 642c114 · 642c114
2 parents e1a6a09 + 6d9d28e
commit 642c114
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cluster-autoscaler/core/scale_up.go b/cluster-autoscaler/core/scale_up.go
@@ -428,7 +428,7 @@ func ScaleUp(context *context.AutoscalingContext, processors *ca_processors.Auto
 
 		newNodes := bestOption.NodeCount
 
-		if context.MaxNodesTotal > 0 && len(nodes)+newNodes > context.MaxNodesTotal {
+		if context.MaxNodesTotal > 0 && len(nodes)+newNodes+len(upcomingNodes) > context.MaxNodesTotal {
 			glog.V(1).Infof("Capping size to max cluster total size (%d)", context.MaxNodesTotal)
 			newNodes = context.MaxNodesTotal - len(nodes) - len(upcomingNodes)
 			if newNodes < 1 {