Skip to content

Commit f8fec55

Browse files
committed
Start fixing tests for CSINode objects
1 parent 18906a8 commit f8fec55

30 files changed

+85
-86
lines changed

cluster-autoscaler/core/podlistprocessor/filter_out_expendable_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func TestFilterOutExpendable(t *testing.T) {
110110
t.Run(tc.name, func(t *testing.T) {
111111
processor := NewFilterOutExpendablePodListProcessor()
112112
snapshot := testsnapshot.NewTestSnapshotOrDie(t)
113-
err := snapshot.SetClusterState(tc.nodes, nil, nil)
113+
err := snapshot.SetClusterState(tc.nodes, nil, nil, nil)
114114
assert.NoError(t, err)
115115

116116
pods, err := processor.Process(&ca_context.AutoscalingContext{

cluster-autoscaler/core/podlistprocessor/filter_out_schedulable_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ func BenchmarkFilterOutSchedulable(b *testing.B) {
280280
}
281281

282282
clusterSnapshot := snapshotFactory()
283-
if err := clusterSnapshot.SetClusterState(nodes, scheduledPods, nil); err != nil {
283+
if err := clusterSnapshot.SetClusterState(nodes, scheduledPods, nil, nil); err != nil {
284284
assert.NoError(b, err)
285285
}
286286

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,7 @@ func runStartDeletionTest(t *testing.T, tc startDeletionTestCase, force bool) {
12281228
t.Fatalf("Couldn't create daemonset lister")
12291229
}
12301230

1231-
registry := kube_util.NewListerRegistry(nil, nil, podLister, pdbLister, dsLister, nil, nil, nil, nil)
1231+
registry := kube_util.NewListerRegistry(nil, nil, nil, podLister, pdbLister, dsLister, nil, nil, nil, nil)
12321232
autoscalingCtx, err := NewScaleTestAutoscalingContext(opts, fakeClient, registry, provider, nil, nil)
12331233
if err != nil {
12341234
t.Fatalf("Couldn't set up autoscaling context: %v", err)
@@ -1541,7 +1541,7 @@ func TestStartDeletionInBatchBasic(t *testing.T) {
15411541

15421542
podLister := kube_util.NewTestPodLister([]*apiv1.Pod{})
15431543
pdbLister := kube_util.NewTestPodDisruptionBudgetLister([]*policyv1.PodDisruptionBudget{})
1544-
registry := kube_util.NewListerRegistry(nil, nil, podLister, pdbLister, nil, nil, nil, nil, nil)
1544+
registry := kube_util.NewListerRegistry(nil, nil, nil, podLister, pdbLister, nil, nil, nil, nil, nil)
15451545
autoscalingCtx, err := NewScaleTestAutoscalingContext(opts, fakeClient, registry, provider, nil, nil)
15461546
if err != nil {
15471547
t.Fatalf("Couldn't set up autoscaling context: %v", err)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func TestDaemonSetEvictionForEmptyNodes(t *testing.T) {
139139
provider := testprovider.NewTestCloudProviderBuilder().Build()
140140
provider.AddNodeGroup("ng1", 1, 10, 1)
141141
provider.AddNode("ng1", n1)
142-
registry := kube_util.NewListerRegistry(nil, nil, nil, nil, nil, nil, nil, nil, nil)
142+
registry := kube_util.NewListerRegistry(nil, nil, nil, nil, nil, nil, nil, nil, nil, nil)
143143

144144
autoscalingCtx, err := NewScaleTestAutoscalingContext(options, fakeClient, registry, provider, nil, nil)
145145
assert.NoError(t, err)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func TestScheduleDeletion(t *testing.T) {
146146
if err != nil {
147147
t.Fatalf("Couldn't create daemonset lister")
148148
}
149-
registry := kube_util.NewListerRegistry(nil, nil, podLister, pdbLister, dsLister, nil, nil, nil, nil)
149+
registry := kube_util.NewListerRegistry(nil, nil, nil, podLister, pdbLister, dsLister, nil, nil, nil, nil)
150150
autoscalingCtx, err := NewScaleTestAutoscalingContext(opts, fakeClient, registry, provider, nil, nil)
151151
if err != nil {
152152
t.Fatalf("Couldn't set up autoscaling context: %v", err)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func TestSoftTaintUpdate(t *testing.T) {
6767
MaxBulkSoftTaintCount: 1,
6868
MaxBulkSoftTaintTime: 3 * time.Second,
6969
}
70-
registry := kube_util.NewListerRegistry(nil, nil, nil, nil, nil, nil, nil, nil, nil)
70+
registry := kube_util.NewListerRegistry(nil, nil, nil, nil, nil, nil, nil, nil, nil, nil)
7171

7272
actx, err := test.NewScaleTestAutoscalingContext(options, fakeClient, registry, provider, nil, nil)
7373
assert.NoError(t, err)
@@ -151,7 +151,7 @@ func TestSoftTaintTimeLimit(t *testing.T) {
151151
MaxBulkSoftTaintCount: 10,
152152
MaxBulkSoftTaintTime: maxSoftTaintDuration,
153153
}
154-
registry := kube_util.NewListerRegistry(nil, nil, nil, nil, nil, nil, nil, nil, nil)
154+
registry := kube_util.NewListerRegistry(nil, nil, nil, nil, nil, nil, nil, nil, nil, nil)
155155

156156
actx, err := test.NewScaleTestAutoscalingContext(options, fakeClient, registry, provider, nil, nil)
157157
assert.NoError(t, err)

cluster-autoscaler/core/scaledown/eligibility/eligibility_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ func TestFilterOutUnremovable(t *testing.T) {
233233
if err != nil {
234234
t.Fatalf("Could not create autoscaling context: %v", err)
235235
}
236-
if err := autoscalingCtx.ClusterSnapshot.SetClusterState(tc.nodes, tc.pods, tc.draSnapshot); err != nil {
236+
if err := autoscalingCtx.ClusterSnapshot.SetClusterState(tc.nodes, tc.pods, tc.draSnapshot, nil); err != nil {
237237
t.Fatalf("Could not SetClusterState: %v", err)
238238
}
239239
unremovableNodes := unremovable.NewNodes()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func TestReplicasCounter(t *testing.T) {
125125
jobLister, _ := kube_util.NewTestJobLister([]*batchv1.Job{job, unsetJob, jobWithSucceededReplicas})
126126
rsLister, _ := kube_util.NewTestReplicaSetLister([]*appsv1.ReplicaSet{rs, unsetRs})
127127
ssLister, _ := kube_util.NewTestStatefulSetLister([]*appsv1.StatefulSet{sS})
128-
listers := kube_util.NewListerRegistry(nil, nil, nil, nil, nil, rcLister, jobLister, rsLister, ssLister)
128+
listers := kube_util.NewListerRegistry(nil, nil, nil, nil, nil, nil, rcLister, jobLister, rsLister, ssLister)
129129
testCases := []struct {
130130
name string
131131
ownerRef metav1.OwnerReference

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ func TestUpdateClusterState(t *testing.T) {
487487
}
488488
rsLister, err := kube_util.NewTestReplicaSetLister(tc.replicasSets)
489489
assert.NoError(t, err)
490-
registry := kube_util.NewListerRegistry(nil, nil, nil, nil, nil, nil, nil, rsLister, nil)
490+
registry := kube_util.NewListerRegistry(nil, nil, nil, nil, nil, nil, nil, nil, rsLister, nil)
491491
provider := testprovider.NewTestCloudProviderBuilder().Build()
492492
provider.AddNodeGroup("ng1", 0, 0, 0)
493493
for _, node := range tc.nodes {
@@ -822,6 +822,7 @@ func TestNewPlannerWithExistingDeletionCandidateNodes(t *testing.T) {
822822
&fake.Clientset{},
823823
kube_util.NewListerRegistry(
824824
allNodeLister,
825+
nil,
825826
readyNodeLister,
826827
nil, nil, nil, nil, nil, nil, nil,
827828
),

cluster-autoscaler/core/scaledown/unneeded/nodes_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ func TestRemovableAt(t *testing.T) {
199199

200200
rsLister, err := kube_util.NewTestReplicaSetLister(nil)
201201
assert.NoError(t, err)
202-
registry := kube_util.NewListerRegistry(nil, nil, nil, nil, nil, nil, nil, rsLister, nil)
202+
registry := kube_util.NewListerRegistry(nil, nil, nil, nil, nil, nil, nil, nil, rsLister, nil)
203203
autoscalingCtx, err := NewScaleTestAutoscalingContext(config.AutoscalingOptions{ScaleDownSimulationTimeout: 5 * time.Minute}, &fake.Clientset{}, registry, provider, nil, nil)
204204
assert.NoError(t, err)
205205

@@ -282,7 +282,7 @@ func TestNodeLoadFromExistingTaints(t *testing.T) {
282282
readyNodeLister := kubernetes.NewTestNodeLister(nil)
283283
readyNodeLister.SetNodes(tc.allNodes)
284284

285-
listerRegistry := kube_util.NewListerRegistry(allNodeLister, readyNodeLister,
285+
listerRegistry := kube_util.NewListerRegistry(allNodeLister, nil, readyNodeLister,
286286
nil, nil, nil, nil, nil, nil, nil)
287287

288288
nodes.LoadFromExistingTaints(listerRegistry, currentTime, tc.nodeDeletionCandidateTTL)

0 commit comments

Comments
 (0)