Use single AtomicScaling option for scale up and scale down

Author: kawych

cluster-autoscaler/cloudprovider/test/test_cloud_provider.go

@@ -443,7 +443,7 @@ func (tng *TestNodeGroup) DeleteNodes(nodes []*apiv1.Node) error {
 	id := tng.id
 	tng.targetSize -= len(nodes)
 	tng.Unlock()
-	if tng.opts != nil && tng.opts.AtomicScaleDown && tng.targetSize != 0 {
+	if tng.opts != nil && tng.opts.AtomicScaling && tng.targetSize != 0 {
 		return fmt.Errorf("TestNodeGroup: attempted to partially scale down a node group that should be scaled down atomically")
 	}
 	for _, node := range nodes {

cluster-autoscaler/config/autoscaling_options.go

@@ -46,8 +46,8 @@ type NodeGroupAutoscalingOptions struct {
 	ScaleDownUnreadyTime time.Duration
 	// Maximum time CA waits for node to be provisioned
 	MaxNodeProvisionTime time.Duration
-	// AtomicScaleDown means that all nodes should be brought down all at once instead of one-by-one
-	AtomicScaleDown bool
+	// AtomicScaling means that all nodes should be provisioned and brought down all at once instead of one-by-one
+	AtomicScaling bool
 }
 
 // GCEOptions contain autoscaling options specific to GCE cloud provider.

cluster-autoscaler/core/scaledown/actuation/actuator_test.go

@@ -1103,7 +1103,7 @@ func TestStartDeletionInBatchBasic(t *testing.T) {
 func sizedNodeGroup(id string, size int, atomic bool) cloudprovider.NodeGroup {
 	ng := testprovider.NewTestNodeGroup(id, 10000, 0, size, true, false, "n1-standard-2", nil, nil)
 	ng.SetOptions(&config.NodeGroupAutoscalingOptions{
-		AtomicScaleDown: atomic,
+		AtomicScaling: atomic,
 	})
 	return ng
 }

cluster-autoscaler/core/scaledown/actuation/group_deletion_scheduler.go

@@ -79,7 +79,7 @@ func (ds *GroupDeletionScheduler) ScheduleDeletion(nodeInfo *framework.NodeInfo,
 		return
 	}
 
-	ds.addToBatcher(nodeInfo, nodeGroup, batchSize, drain, opts.AtomicScaleDown)
+	ds.addToBatcher(nodeInfo, nodeGroup, batchSize, drain, opts.AtomicScaling)
 }
 
 // prepareNodeForDeletion is a long-running operation, so it needs to avoid locking the AtomicDeletionScheduler object

cluster-autoscaler/core/scaledown/budgets/budgets.go

@@ -52,8 +52,6 @@ func NewScaleDownBudgetProcessor(ctx *context.AutoscalingContext, as scaledown.A
 func (bp *ScaleDownBudgetProcessor) CropNodes(empty, drain []*apiv1.Node) (emptyToDelete, drainToDelete []*NodeGroupView) {
 	emptyIndividual, emptyAtomic := bp.categorize(bp.group(empty))
 	drainIndividual, drainAtomic := bp.categorize(bp.group(drain))
-	//emptyIndividual, emptyAtomic := bp.groupByNodeGroup(empty)
-	//drainIndividual, drainAtomic := bp.groupByNodeGroup(drain)
 
 	emptyInProgress, drainInProgress := bp.actuationStatus.DeletionsInProgress()
 	parallelismBudget := bp.ctx.MaxScaleDownParallelism - len(emptyInProgress) - len(drainInProgress)
@@ -146,7 +144,7 @@ func (bp *ScaleDownBudgetProcessor) categorize(groups []*NodeGroupView) (individ
 			klog.Errorf("Failed to get autoscaling options for node group %s: %v", view.Group.Id(), err)
 			continue
 		}
-		if autoscalingOptions != nil && autoscalingOptions.AtomicScaleDown {
+		if autoscalingOptions != nil && autoscalingOptions.AtomicScaling {
 			atomic = append(atomic, view)
 		} else {
 			individual = append(individual, view)
@@ -169,7 +167,7 @@ func (bp *ScaleDownBudgetProcessor) groupByNodeGroup(nodes []*apiv1.Node) (indiv
 			klog.Errorf("Failed to get autoscaling options for node group %s: %v", nodeGroup.Id(), err)
 			continue
 		}
-		if autoscalingOptions != nil && autoscalingOptions.AtomicScaleDown {
+		if autoscalingOptions != nil && autoscalingOptions.AtomicScaling {
 			if idx, ok := atomicGroup[nodeGroup]; ok {
 				atomic[idx].Nodes = append(atomic[idx].Nodes, node)
 			} else {

cluster-autoscaler/core/scaledown/budgets/budgets_test.go

@@ -361,7 +361,7 @@ var transformNodeGroupView = cmp.Transformer("transformNodeGroupView", func(b No
 func sizedNodeGroup(id string, size int, atomic bool) cloudprovider.NodeGroup {
 	ng := testprovider.NewTestNodeGroup(id, 10000, 0, size, true, false, "n1-standard-2", nil, nil)
 	ng.SetOptions(&config.NodeGroupAutoscalingOptions{
-		AtomicScaleDown: atomic,
+		AtomicScaling: atomic,
 	})
 	return ng
 }

cluster-autoscaler/core/scaledown/planner/planner.go

@@ -189,7 +189,7 @@ func (p *Planner) filterOutIncompleteAtomicNodeGroups(nodes []*apiv1.Node) ([]*a
 			klog.Errorf("Failed to get autoscaling options for node group %s: %v", nodeGroup.Id(), err)
 			continue
 		}
-		if autoscalingOptions != nil && autoscalingOptions.AtomicScaleDown {
+		if autoscalingOptions != nil && autoscalingOptions.AtomicScaling {
 			klog.V(2).Infof("Considering node %s for atomic scale down", node.Name)
 			nodesByGroup[nodeGroup] = append(nodesByGroup[nodeGroup], node)
 		} else {

cluster-autoscaler/core/scaledown/planner/planner_test.go

@@ -795,7 +795,7 @@ func TestNodesToDelete(t *testing.T) {
 func sizedNodeGroup(id string, size int, atomic bool) cloudprovider.NodeGroup {
 	ng := testprovider.NewTestNodeGroup(id, 10000, 0, size, true, false, "n1-standard-2", nil, nil)
 	ng.SetOptions(&config.NodeGroupAutoscalingOptions{
-		AtomicScaleDown: atomic,
+		AtomicScaling: atomic,
 	})
 	return ng
 }