@@ -46,6 +46,7 @@ import (
4646 "k8s.io/autoscaler/cluster-autoscaler/processors/nodegroupset"
4747 "k8s.io/autoscaler/cluster-autoscaler/processors/nodeinfosprovider"
4848 "k8s.io/autoscaler/cluster-autoscaler/processors/status"
49+ processorstest "k8s.io/autoscaler/cluster-autoscaler/processors/test"
4950 "k8s.io/autoscaler/cluster-autoscaler/utils/errors"
5051 kube_util "k8s.io/autoscaler/cluster-autoscaler/utils/kubernetes"
5152 "k8s.io/autoscaler/cluster-autoscaler/utils/taints"
@@ -1055,7 +1056,7 @@ func runSimpleScaleUpTest(t *testing.T, config *ScaleUpTestConfig) *ScaleUpTestR
10551056 assert .NoError (t , err )
10561057 clusterState := clusterstate .NewClusterStateRegistry (provider , clusterstate.ClusterStateRegistryConfig {}, context .LogRecorder , NewBackoff (), nodegroupconfig .NewDefaultNodeGroupConfigProcessor (options .NodeGroupDefaults ), asyncnodegroups .NewDefaultAsyncNodeGroupStateChecker ())
10571058 clusterState .UpdateNodes (nodes , nodeInfos , time .Now ())
1058- processors := NewTestProcessors (& context )
1059+ processors := processorstest . NewTestProcessors (& context )
10591060 processors .ScaleStateNotifier .Register (clusterState )
10601061 if config .EnableAutoprovisioning {
10611062 processors .NodeGroupListProcessor = & MockAutoprovisioningNodeGroupListProcessor {T : t }
@@ -1163,7 +1164,7 @@ func TestScaleUpUnhealthy(t *testing.T) {
11631164 clusterState .UpdateNodes (nodes , nodeInfos , time .Now ())
11641165 p3 := BuildTestPod ("p-new" , 550 , 0 )
11651166
1166- processors := NewTestProcessors (& context )
1167+ processors := processorstest . NewTestProcessors (& context )
11671168 suOrchestrator := New ()
11681169 suOrchestrator .Initialize (& context , processors , clusterState , newEstimatorBuilder (), taints.TaintConfig {})
11691170 scaleUpStatus , err := suOrchestrator .ScaleUp ([]* apiv1.Pod {p3 }, nodes , []* appsv1.DaemonSet {}, nodeInfos , false )
@@ -1209,7 +1210,7 @@ func TestBinpackingLimiter(t *testing.T) {
12091210
12101211 extraPod := BuildTestPod ("p-new" , 500 , 0 )
12111212
1212- processors := NewTestProcessors (& context )
1213+ processors := processorstest . NewTestProcessors (& context )
12131214
12141215 // We should stop binpacking after finding expansion option from first node group.
12151216 processors .BinpackingLimiter = & MockBinpackingLimiter {}
@@ -1263,7 +1264,7 @@ func TestScaleUpNoHelp(t *testing.T) {
12631264 clusterState .UpdateNodes (nodes , nodeInfos , time .Now ())
12641265 p3 := BuildTestPod ("p-new" , 500 , 0 )
12651266
1266- processors := NewTestProcessors (& context )
1267+ processors := processorstest . NewTestProcessors (& context )
12671268 suOrchestrator := New ()
12681269 suOrchestrator .Initialize (& context , processors , clusterState , newEstimatorBuilder (), taints.TaintConfig {})
12691270 scaleUpStatus , err := suOrchestrator .ScaleUp ([]* apiv1.Pod {p3 }, nodes , []* appsv1.DaemonSet {}, nodeInfos , false )
@@ -1485,7 +1486,7 @@ func TestScaleUpBalanceGroups(t *testing.T) {
14851486 pods = append (pods , BuildTestPod (fmt .Sprintf ("test-pod-%v" , i ), 80 , 0 ))
14861487 }
14871488
1488- processors := NewTestProcessors (& context )
1489+ processors := processorstest . NewTestProcessors (& context )
14891490 suOrchestrator := New ()
14901491 suOrchestrator .Initialize (& context , processors , clusterState , newEstimatorBuilder (), taints.TaintConfig {})
14911492 scaleUpStatus , typedErr := suOrchestrator .ScaleUp (pods , nodes , []* appsv1.DaemonSet {}, nodeInfos , false )
@@ -1541,7 +1542,7 @@ func TestScaleUpAutoprovisionedNodeGroup(t *testing.T) {
15411542
15421543 clusterState := clusterstate .NewClusterStateRegistry (provider , clusterstate.ClusterStateRegistryConfig {}, context .LogRecorder , NewBackoff (), nodegroupconfig .NewDefaultNodeGroupConfigProcessor (config.NodeGroupAutoscalingOptions {MaxNodeProvisionTime : 15 * time .Minute }), asyncnodegroups .NewDefaultAsyncNodeGroupStateChecker ())
15431544
1544- processors := NewTestProcessors (& context )
1545+ processors := processorstest . NewTestProcessors (& context )
15451546 processors .NodeGroupListProcessor = & MockAutoprovisioningNodeGroupListProcessor {T : t }
15461547 processors .NodeGroupManager = & MockAutoprovisioningNodeGroupManager {T : t , ExtraGroups : 0 }
15471548
@@ -1596,7 +1597,7 @@ func TestScaleUpBalanceAutoprovisionedNodeGroups(t *testing.T) {
15961597
15971598 clusterState := clusterstate .NewClusterStateRegistry (provider , clusterstate.ClusterStateRegistryConfig {}, context .LogRecorder , NewBackoff (), nodegroupconfig .NewDefaultNodeGroupConfigProcessor (config.NodeGroupAutoscalingOptions {MaxNodeProvisionTime : 15 * time .Minute }), asyncnodegroups .NewDefaultAsyncNodeGroupStateChecker ())
15981599
1599- processors := NewTestProcessors (& context )
1600+ processors := processorstest . NewTestProcessors (& context )
16001601 processors .NodeGroupListProcessor = & MockAutoprovisioningNodeGroupListProcessor {T : t }
16011602 processors .NodeGroupManager = & MockAutoprovisioningNodeGroupManager {T : t , ExtraGroups : 2 }
16021603
@@ -1654,7 +1655,7 @@ func TestScaleUpToMeetNodeGroupMinSize(t *testing.T) {
16541655
16551656 nodes := []* apiv1.Node {n1 , n2 }
16561657 nodeInfos , _ := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).Process (& context , nodes , []* appsv1.DaemonSet {}, taints.TaintConfig {}, time .Now ())
1657- processors := NewTestProcessors (& context )
1658+ processors := processorstest . NewTestProcessors (& context )
16581659 clusterState := clusterstate .NewClusterStateRegistry (provider , clusterstate.ClusterStateRegistryConfig {}, context .LogRecorder , NewBackoff (), nodegroupconfig .NewDefaultNodeGroupConfigProcessor (config.NodeGroupAutoscalingOptions {MaxNodeProvisionTime : 15 * time .Minute }), asyncnodegroups .NewDefaultAsyncNodeGroupStateChecker ())
16591660 clusterState .UpdateNodes (nodes , nodeInfos , time .Now ())
16601661
@@ -1746,7 +1747,7 @@ func TestScaleupAsyncNodeGroupsEnabled(t *testing.T) {
17461747
17471748 clusterState := clusterstate .NewClusterStateRegistry (provider , clusterstate.ClusterStateRegistryConfig {}, context .LogRecorder , NewBackoff (), nodegroupconfig .NewDefaultNodeGroupConfigProcessor (config.NodeGroupAutoscalingOptions {MaxNodeProvisionTime : 15 * time .Minute }), asyncnodegroups .NewDefaultAsyncNodeGroupStateChecker ())
17481749
1749- processors := NewTestProcessors (& context )
1750+ processors := processorstest . NewTestProcessors (& context )
17501751 processors .NodeGroupListProcessor = & MockAutoprovisioningNodeGroupListProcessor {T : t }
17511752 processors .NodeGroupManager = & MockAutoprovisioningNodeGroupManager {T : t , ExtraGroups : 0 }
17521753 processors .AsyncNodeGroupStateChecker = & asyncnodegroups.MockAsyncNodeGroupStateChecker {IsUpcomingNodeGroup : tc .isUpcomingMockMap }
0 commit comments