@@ -977,7 +977,7 @@ func runSimpleScaleUpTest(t *testing.T, config *ScaleUpTestConfig) *ScaleUpTestR
977
977
extraPods [i ] = buildTestPod (p )
978
978
}
979
979
podLister := kube_util .NewTestPodLister (pods )
980
- listers := kube_util .NewListerRegistry (nil , nil , podLister , nil , nil , nil , nil , nil , nil )
980
+ listers := kube_util .NewListerRegistry (nil , nil , nil , podLister , nil , nil , nil , nil , nil , nil )
981
981
982
982
// setup node groups
983
983
var provider * testprovider.TestCloudProvider
@@ -1046,7 +1046,7 @@ func runSimpleScaleUpTest(t *testing.T, config *ScaleUpTestConfig) *ScaleUpTestR
1046
1046
err = context .ClusterSnapshot .SetClusterState (nodes , kube_util .ScheduledPods (pods ), nil )
1047
1047
assert .NoError (t , err )
1048
1048
nodeInfos , err := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).
1049
- Process (& context , nodes , []* appsv1.DaemonSet {}, taints.TaintConfig {}, now )
1049
+ Process (& context , nodes , []* apiv1. Node {}, [] * appsv1.DaemonSet {}, taints.TaintConfig {}, now )
1050
1050
assert .NoError (t , err )
1051
1051
clusterState := clusterstate .NewClusterStateRegistry (provider , clusterstate.ClusterStateRegistryConfig {}, context .LogRecorder , NewBackoff (), nodegroupconfig .NewDefaultNodeGroupConfigProcessor (options .NodeGroupDefaults ), asyncnodegroups .NewDefaultAsyncNodeGroupStateChecker ())
1052
1052
clusterState .UpdateNodes (nodes , nodeInfos , time .Now ())
@@ -1135,7 +1135,7 @@ func TestScaleUpUnhealthy(t *testing.T) {
1135
1135
pods := []* apiv1.Pod {p1 , p2 }
1136
1136
1137
1137
podLister := kube_util .NewTestPodLister (pods )
1138
- listers := kube_util .NewListerRegistry (nil , nil , podLister , nil , nil , nil , nil , nil , nil )
1138
+ listers := kube_util .NewListerRegistry (nil , nil , nil , podLister , nil , nil , nil , nil , nil , nil )
1139
1139
1140
1140
provider := testprovider .NewTestCloudProviderBuilder ().WithOnScaleUp (func (nodeGroup string , increase int ) error {
1141
1141
t .Fatalf ("No expansion is expected, but increased %s by %d" , nodeGroup , increase )
@@ -1155,7 +1155,7 @@ func TestScaleUpUnhealthy(t *testing.T) {
1155
1155
assert .NoError (t , err )
1156
1156
err = context .ClusterSnapshot .SetClusterState (nodes , pods , nil )
1157
1157
assert .NoError (t , err )
1158
- nodeInfos , _ := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).Process (& context , nodes , []* appsv1.DaemonSet {}, taints.TaintConfig {}, now )
1158
+ nodeInfos , _ := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).Process (& context , nodes , []* apiv1. Node {}, [] * appsv1.DaemonSet {}, taints.TaintConfig {}, now )
1159
1159
clusterState := clusterstate .NewClusterStateRegistry (provider , clusterstate.ClusterStateRegistryConfig {}, context .LogRecorder , NewBackoff (), nodegroupconfig .NewDefaultNodeGroupConfigProcessor (config.NodeGroupAutoscalingOptions {MaxNodeProvisionTime : 15 * time .Minute }), asyncnodegroups .NewDefaultAsyncNodeGroupStateChecker ())
1160
1160
clusterState .UpdateNodes (nodes , nodeInfos , time .Now ())
1161
1161
p3 := BuildTestPod ("p-new" , 550 , 0 )
@@ -1181,7 +1181,7 @@ func TestBinpackingLimiter(t *testing.T) {
1181
1181
nodes := []* apiv1.Node {n1 , n2 }
1182
1182
1183
1183
podLister := kube_util .NewTestPodLister ([]* apiv1.Pod {})
1184
- listers := kube_util .NewListerRegistry (nil , nil , podLister , nil , nil , nil , nil , nil , nil )
1184
+ listers := kube_util .NewListerRegistry (nil , nil , nil , podLister , nil , nil , nil , nil , nil , nil )
1185
1185
1186
1186
provider := testprovider .NewTestCloudProviderBuilder ().WithOnScaleUp (func (nodeGroup string , increase int ) error {
1187
1187
return nil
@@ -1199,7 +1199,7 @@ func TestBinpackingLimiter(t *testing.T) {
1199
1199
err = context .ClusterSnapshot .SetClusterState (nodes , nil , nil )
1200
1200
assert .NoError (t , err )
1201
1201
nodeInfos , err := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).
1202
- Process (& context , nodes , []* appsv1.DaemonSet {}, taints.TaintConfig {}, now )
1202
+ Process (& context , nodes , []* apiv1. Node {}, [] * appsv1.DaemonSet {}, taints.TaintConfig {}, now )
1203
1203
assert .NoError (t , err )
1204
1204
1205
1205
clusterState := clusterstate .NewClusterStateRegistry (provider , clusterstate.ClusterStateRegistryConfig {}, context .LogRecorder , NewBackoff (), nodegroupconfig .NewDefaultNodeGroupConfigProcessor (config.NodeGroupAutoscalingOptions {MaxNodeProvisionTime : 15 * time .Minute }), asyncnodegroups .NewDefaultAsyncNodeGroupStateChecker ())
@@ -1239,7 +1239,7 @@ func TestScaleUpNoHelp(t *testing.T) {
1239
1239
pods := []* apiv1.Pod {p1 }
1240
1240
1241
1241
podLister := kube_util .NewTestPodLister (pods )
1242
- listers := kube_util .NewListerRegistry (nil , nil , podLister , nil , nil , nil , nil , nil , nil )
1242
+ listers := kube_util .NewListerRegistry (nil , nil , nil , podLister , nil , nil , nil , nil , nil , nil )
1243
1243
1244
1244
provider := testprovider .NewTestCloudProviderBuilder ().WithOnScaleUp (func (nodeGroup string , increase int ) error {
1245
1245
t .Fatalf ("No expansion is expected" )
@@ -1258,7 +1258,7 @@ func TestScaleUpNoHelp(t *testing.T) {
1258
1258
assert .NoError (t , err )
1259
1259
err = context .ClusterSnapshot .SetClusterState (nodes , pods , nil )
1260
1260
assert .NoError (t , err )
1261
- nodeInfos , _ := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).Process (& context , nodes , []* appsv1.DaemonSet {}, taints.TaintConfig {}, now )
1261
+ nodeInfos , _ := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).Process (& context , nodes , []* apiv1. Node {}, [] * appsv1.DaemonSet {}, taints.TaintConfig {}, now )
1262
1262
clusterState := clusterstate .NewClusterStateRegistry (provider , clusterstate.ClusterStateRegistryConfig {}, context .LogRecorder , NewBackoff (), nodegroupconfig .NewDefaultNodeGroupConfigProcessor (config.NodeGroupAutoscalingOptions {MaxNodeProvisionTime : 15 * time .Minute }), asyncnodegroups .NewDefaultAsyncNodeGroupStateChecker ())
1263
1263
clusterState .UpdateNodes (nodes , nodeInfos , time .Now ())
1264
1264
p3 := BuildTestPod ("p-new" , 500 , 0 )
@@ -1408,12 +1408,12 @@ func TestComputeSimilarNodeGroups(t *testing.T) {
1408
1408
nodeGroupSetProcessor .similarNodeGroups = append (nodeGroupSetProcessor .similarNodeGroups , provider .GetNodeGroup (ng ))
1409
1409
}
1410
1410
1411
- listers := kube_util .NewListerRegistry (nil , nil , kube_util .NewTestPodLister (nil ), nil , nil , nil , nil , nil , nil )
1411
+ listers := kube_util .NewListerRegistry (nil , nil , nil , kube_util .NewTestPodLister (nil ), nil , nil , nil , nil , nil , nil )
1412
1412
ctx , err := NewScaleTestAutoscalingContext (config.AutoscalingOptions {BalanceSimilarNodeGroups : tc .balancingEnabled }, & fake.Clientset {}, listers , provider , nil , nil )
1413
1413
assert .NoError (t , err )
1414
1414
err = ctx .ClusterSnapshot .SetClusterState (nodes , nil , nil )
1415
1415
assert .NoError (t , err )
1416
- nodeInfos , _ := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).Process (& ctx , nodes , []* appsv1.DaemonSet {}, taints.TaintConfig {}, now )
1416
+ nodeInfos , _ := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).Process (& ctx , nodes , []* apiv1. Node {}, [] * appsv1.DaemonSet {}, taints.TaintConfig {}, now )
1417
1417
clusterState := clusterstate .NewClusterStateRegistry (provider , clusterstate.ClusterStateRegistryConfig {}, ctx .LogRecorder , NewBackoff (), nodegroupconfig .NewDefaultNodeGroupConfigProcessor (config.NodeGroupAutoscalingOptions {MaxNodeProvisionTime : 15 * time .Minute }), asyncnodegroups .NewDefaultAsyncNodeGroupStateChecker ())
1418
1418
assert .NoError (t , clusterState .UpdateNodes (nodes , nodeInfos , time .Now ()))
1419
1419
@@ -1485,7 +1485,7 @@ func TestScaleUpBalanceGroups(t *testing.T) {
1485
1485
}
1486
1486
1487
1487
podLister := kube_util .NewTestPodLister (podList )
1488
- listers := kube_util .NewListerRegistry (nil , nil , podLister , nil , nil , nil , nil , nil , nil )
1488
+ listers := kube_util .NewListerRegistry (nil , nil , nil , podLister , nil , nil , nil , nil , nil , nil )
1489
1489
1490
1490
options := config.AutoscalingOptions {
1491
1491
EstimatorName : estimator .BinpackingEstimatorName ,
@@ -1497,7 +1497,7 @@ func TestScaleUpBalanceGroups(t *testing.T) {
1497
1497
assert .NoError (t , err )
1498
1498
err = context .ClusterSnapshot .SetClusterState (nodes , podList , nil )
1499
1499
assert .NoError (t , err )
1500
- nodeInfos , _ := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).Process (& context , nodes , []* appsv1.DaemonSet {}, taints.TaintConfig {}, now )
1500
+ nodeInfos , _ := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).Process (& context , nodes , []* apiv1. Node {}, [] * appsv1.DaemonSet {}, taints.TaintConfig {}, now )
1501
1501
clusterState := clusterstate .NewClusterStateRegistry (provider , clusterstate.ClusterStateRegistryConfig {}, context .LogRecorder , NewBackoff (), nodegroupconfig .NewDefaultNodeGroupConfigProcessor (config.NodeGroupAutoscalingOptions {MaxNodeProvisionTime : 15 * time .Minute }), asyncnodegroups .NewDefaultAsyncNodeGroupStateChecker ())
1502
1502
clusterState .UpdateNodes (nodes , nodeInfos , time .Now ())
1503
1503
@@ -1557,7 +1557,7 @@ func TestScaleUpAutoprovisionedNodeGroup(t *testing.T) {
1557
1557
MaxMemoryTotal : 5000 * 64 * 20 ,
1558
1558
}
1559
1559
podLister := kube_util .NewTestPodLister ([]* apiv1.Pod {})
1560
- listers := kube_util .NewListerRegistry (nil , nil , podLister , nil , nil , nil , nil , nil , nil )
1560
+ listers := kube_util .NewListerRegistry (nil , nil , nil , podLister , nil , nil , nil , nil , nil , nil )
1561
1561
context , err := NewScaleTestAutoscalingContext (options , fakeClient , listers , provider , nil , nil )
1562
1562
assert .NoError (t , err )
1563
1563
@@ -1568,7 +1568,7 @@ func TestScaleUpAutoprovisionedNodeGroup(t *testing.T) {
1568
1568
processors .NodeGroupManager = & MockAutoprovisioningNodeGroupManager {T : t , ExtraGroups : 0 }
1569
1569
1570
1570
nodes := []* apiv1.Node {}
1571
- nodeInfos , _ := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).Process (& context , nodes , []* appsv1.DaemonSet {}, taints.TaintConfig {}, time .Now ())
1571
+ nodeInfos , _ := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).Process (& context , nodes , []* apiv1. Node {}, [] * appsv1.DaemonSet {}, taints.TaintConfig {}, time .Now ())
1572
1572
1573
1573
suOrchestrator := New ()
1574
1574
suOrchestrator .Initialize (& context , processors , clusterState , newEstimatorBuilder (), taints.TaintConfig {})
@@ -1608,7 +1608,7 @@ func TestScaleUpBalanceAutoprovisionedNodeGroups(t *testing.T) {
1608
1608
MaxMemoryTotal : 5000 * 64 * 20 ,
1609
1609
}
1610
1610
podLister := kube_util .NewTestPodLister ([]* apiv1.Pod {})
1611
- listers := kube_util .NewListerRegistry (nil , nil , podLister , nil , nil , nil , nil , nil , nil )
1611
+ listers := kube_util .NewListerRegistry (nil , nil , nil , podLister , nil , nil , nil , nil , nil , nil )
1612
1612
context , err := NewScaleTestAutoscalingContext (options , fakeClient , listers , provider , nil , nil )
1613
1613
assert .NoError (t , err )
1614
1614
@@ -1619,7 +1619,7 @@ func TestScaleUpBalanceAutoprovisionedNodeGroups(t *testing.T) {
1619
1619
processors .NodeGroupManager = & MockAutoprovisioningNodeGroupManager {T : t , ExtraGroups : 2 }
1620
1620
1621
1621
nodes := []* apiv1.Node {}
1622
- nodeInfos , _ := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).Process (& context , nodes , []* appsv1.DaemonSet {}, taints.TaintConfig {}, time .Now ())
1622
+ nodeInfos , _ := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).Process (& context , nodes , []* apiv1. Node {}, [] * appsv1.DaemonSet {}, taints.TaintConfig {}, time .Now ())
1623
1623
1624
1624
suOrchestrator := New ()
1625
1625
suOrchestrator .Initialize (& context , processors , clusterState , newEstimatorBuilder (), taints.TaintConfig {})
@@ -1638,7 +1638,7 @@ func TestScaleUpBalanceAutoprovisionedNodeGroups(t *testing.T) {
1638
1638
1639
1639
func TestScaleUpToMeetNodeGroupMinSize (t * testing.T ) {
1640
1640
podLister := kube_util .NewTestPodLister ([]* apiv1.Pod {})
1641
- listers := kube_util .NewListerRegistry (nil , nil , podLister , nil , nil , nil , nil , nil , nil )
1641
+ listers := kube_util .NewListerRegistry (nil , nil , nil , podLister , nil , nil , nil , nil , nil , nil )
1642
1642
provider := testprovider .NewTestCloudProviderBuilder ().WithOnScaleUp (func (nodeGroup string , increase int ) error {
1643
1643
assert .Equal (t , "ng1" , nodeGroup )
1644
1644
assert .Equal (t , 1 , increase )
@@ -1673,7 +1673,7 @@ func TestScaleUpToMeetNodeGroupMinSize(t *testing.T) {
1673
1673
nodes := []* apiv1.Node {n1 , n2 }
1674
1674
err = context .ClusterSnapshot .SetClusterState (nodes , nil , nil )
1675
1675
assert .NoError (t , err )
1676
- nodeInfos , _ := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).Process (& context , nodes , []* appsv1.DaemonSet {}, taints.TaintConfig {}, time .Now ())
1676
+ nodeInfos , _ := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).Process (& context , nodes , []* apiv1. Node {}, [] * appsv1.DaemonSet {}, taints.TaintConfig {}, time .Now ())
1677
1677
processors := processorstest .NewTestProcessors (& context )
1678
1678
clusterState := clusterstate .NewClusterStateRegistry (provider , clusterstate.ClusterStateRegistryConfig {}, context .LogRecorder , NewBackoff (), nodegroupconfig .NewDefaultNodeGroupConfigProcessor (config.NodeGroupAutoscalingOptions {MaxNodeProvisionTime : 15 * time .Minute }), asyncnodegroups .NewDefaultAsyncNodeGroupStateChecker ())
1679
1679
clusterState .UpdateNodes (nodes , nodeInfos , time .Now ())
@@ -1756,7 +1756,7 @@ func TestScaleupAsyncNodeGroupsEnabled(t *testing.T) {
1756
1756
AsyncNodeGroupsEnabled : true ,
1757
1757
}
1758
1758
podLister := kube_util .NewTestPodLister ([]* apiv1.Pod {})
1759
- listers := kube_util .NewListerRegistry (nil , nil , podLister , nil , nil , nil , nil , nil , nil )
1759
+ listers := kube_util .NewListerRegistry (nil , nil , nil , podLister , nil , nil , nil , nil , nil , nil )
1760
1760
context , err := NewScaleTestAutoscalingContext (options , fakeClient , listers , provider , nil , nil )
1761
1761
assert .NoError (t , err )
1762
1762
@@ -1768,7 +1768,7 @@ func TestScaleupAsyncNodeGroupsEnabled(t *testing.T) {
1768
1768
processors .AsyncNodeGroupStateChecker = & asyncnodegroups.MockAsyncNodeGroupStateChecker {IsUpcomingNodeGroup : tc .isUpcomingMockMap }
1769
1769
1770
1770
nodes := []* apiv1.Node {}
1771
- nodeInfos , _ := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).Process (& context , nodes , []* appsv1.DaemonSet {}, taints.TaintConfig {}, time .Now ())
1771
+ nodeInfos , _ := nodeinfosprovider .NewDefaultTemplateNodeInfoProvider (nil , false ).Process (& context , nodes , []* apiv1. Node {}, [] * appsv1.DaemonSet {}, taints.TaintConfig {}, time .Now ())
1772
1772
1773
1773
suOrchestrator := New ()
1774
1774
suOrchestrator .Initialize (& context , processors , clusterState , newEstimatorBuilder (), taints.TaintConfig {})
0 commit comments