Minor refactor to scale-up orchestrator for more re-usability

kubernetes · Dec 30, 2024 · 86d6ac1 · 86d6ac1
1 parent 03e2795
commit 86d6ac1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/cluster-autoscaler/core/scaleup/orchestrator/async_initializer.go b/cluster-autoscaler/core/scaleup/orchestrator/async_initializer.go
@@ -50,7 +50,8 @@ type AsyncNodeGroupInitializer struct {
 	atomicScaleUp          bool
 }
 
-func newAsyncNodeGroupInitializer(
+// NewAsyncNodeGroupInitializer creates a new AsyncNodeGroupInitializer instance.
+func NewAsyncNodeGroupInitializer(
 	nodeGroup cloudprovider.NodeGroup,
 	nodeInfo *framework.NodeInfo,
 	scaleUpExecutor *scaleUpExecutor,

diff --git a/cluster-autoscaler/core/scaleup/orchestrator/executor.go b/cluster-autoscaler/core/scaleup/orchestrator/executor.go
@@ -138,7 +138,7 @@ func (e *scaleUpExecutor) executeScaleUpsParallel(
 			failedNodeGroups[i] = result.info.Group
 			scaleUpErrors[i] = result.err
 		}
-		return combineConcurrentScaleUpErrors(scaleUpErrors), failedNodeGroups
+		return CombineConcurrentScaleUpErrors(scaleUpErrors), failedNodeGroups
 	}
 	return nil, nil
 }
@@ -188,7 +188,8 @@ func (e *scaleUpExecutor) executeScaleUp(
 	return nil
 }
 
-func combineConcurrentScaleUpErrors(errs []errors.AutoscalerError) errors.AutoscalerError {
+// CombineConcurrentScaleUpErrors returns combined scale-up error to report after multiple concurrent scale-ups might haver failed.
+func CombineConcurrentScaleUpErrors(errs []errors.AutoscalerError) errors.AutoscalerError {
 	if len(errs) == 0 {
 		return nil
 	}

diff --git a/cluster-autoscaler/core/scaleup/orchestrator/executor_test.go b/cluster-autoscaler/core/scaleup/orchestrator/executor_test.go
@@ -120,7 +120,7 @@ func TestCombinedConcurrentScaleUpErrors(t *testing.T) {
 
 	for _, testCase := range testCases {
 		t.Run(testCase.desc, func(t *testing.T) {
-			combinedErr := combineConcurrentScaleUpErrors(testCase.errors)
+			combinedErr := CombineConcurrentScaleUpErrors(testCase.errors)
 			assert.Equal(t, testCase.expectedErr, combinedErr)
 		})
 	}

diff --git a/cluster-autoscaler/core/scaleup/orchestrator/orchestrator.go b/cluster-autoscaler/core/scaleup/orchestrator/orchestrator.go
@@ -222,7 +222,9 @@ func (o *ScaleUpOrchestrator) ScaleUp(
 			return buildNoOptionsAvailableStatus(markedEquivalenceGroups, skippedNodeGroups, nodeGroups), nil
 		}
 		var scaleUpStatus *status.ScaleUpStatus
-		createNodeGroupResults, scaleUpStatus, aErr = o.CreateNodeGroup(bestOption, nodeInfos, schedulablePodGroups, podEquivalenceGroups, daemonSets, allOrNothing)
+		oldId := bestOption.NodeGroup.Id()
+		initializer := NewAsyncNodeGroupInitializer(bestOption.NodeGroup, nodeInfos[oldId], o.scaleUpExecutor, o.taintConfig, daemonSets, o.processors.ScaleUpStatusProcessor, o.autoscalingContext, allOrNothing)
+		createNodeGroupResults, scaleUpStatus, aErr = o.CreateNodeGroup(bestOption, nodeInfos, schedulablePodGroups, podEquivalenceGroups, daemonSets, initializer)
 		if aErr != nil {
 			return scaleUpStatus, aErr
 		}
@@ -501,15 +503,14 @@ func (o *ScaleUpOrchestrator) CreateNodeGroup(
 	schedulablePodGroups map[string][]estimator.PodEquivalenceGroup,
 	podEquivalenceGroups []*equivalence.PodGroup,
 	daemonSets []*appsv1.DaemonSet,
-	allOrNothing bool,
+	initializer nodegroups.AsyncNodeGroupInitializer,
 ) ([]nodegroups.CreateNodeGroupResult, *status.ScaleUpStatus, errors.AutoscalerError) {
 	createNodeGroupResults := make([]nodegroups.CreateNodeGroupResult, 0)
 
 	oldId := initialOption.NodeGroup.Id()
 	var createNodeGroupResult nodegroups.CreateNodeGroupResult
 	var aErr errors.AutoscalerError
 	if o.autoscalingContext.AsyncNodeGroupsEnabled {
-		initializer := newAsyncNodeGroupInitializer(initialOption.NodeGroup, nodeInfos[oldId], o.scaleUpExecutor, o.taintConfig, daemonSets, o.processors.ScaleUpStatusProcessor, o.autoscalingContext, allOrNothing)
 		createNodeGroupResult, aErr = o.processors.NodeGroupManager.CreateNodeGroupAsync(o.autoscalingContext, initialOption.NodeGroup, initializer)
 	} else {
 		createNodeGroupResult, aErr = o.processors.NodeGroupManager.CreateNodeGroup(o.autoscalingContext, initialOption.NodeGroup)