Skip to content

Commit 4316ba9

Browse files
Huang-WeiHuang-Wei
committed
adapt to misc upstream SDK changes
1 parent e3484e3 commit 4316ba9

File tree

14 files changed

+169
-96
lines changed

14 files changed

+169
-96
lines changed

‎pkg/capacityscheduling/capacity_scheduling_test.go

Lines changed: 43 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
v1 "k8s.io/api/core/v1"
2929
"k8s.io/apimachinery/pkg/api/resource"
3030
apiruntime "k8s.io/apimachinery/pkg/runtime"
31-
"k8s.io/apimachinery/pkg/util/wait"
3231
"k8s.io/client-go/informers"
3332
clientsetfake "k8s.io/client-go/kubernetes/fake"
3433
"k8s.io/client-go/tools/events"
@@ -141,6 +140,9 @@ func TestPreFilter(t *testing.T) {
141140
}
142141
for _, tt := range tests {
143142
t.Run(tt.name, func(t *testing.T) {
143+
ctx, cancel := context.WithCancel(context.Background())
144+
defer cancel()
145+
144146
var registerPlugins []st.RegisterPluginFunc
145147
registeredPlugins := append(
146148
registerPlugins,
@@ -149,7 +151,7 @@ func TestPreFilter(t *testing.T) {
149151
)
150152

151153
fwk, err := st.NewFramework(
152-
registeredPlugins, "", wait.NeverStop,
154+
ctx, registeredPlugins, "",
153155
frameworkruntime.WithPodNominator(testutil.NewPodNominator(nil)),
154156
frameworkruntime.WithSnapshotSharedLister(testutil.NewFakeSharedLister(make([]*v1.Pod, 0), make([]*v1.Node, 0))),
155157
)
@@ -316,9 +318,9 @@ func TestPostFilter(t *testing.T) {
316318
defer cancel()
317319

318320
fwk, err := st.NewFramework(
321+
ctx,
319322
registeredPlugins,
320323
"default-scheduler",
321-
ctx.Done(),
322324
frameworkruntime.WithClientSet(cs),
323325
frameworkruntime.WithEventRecorder(&events.FakeRecorder{}),
324326
frameworkruntime.WithInformerFactory(informerFactory),
@@ -439,6 +441,9 @@ func TestReserve(t *testing.T) {
439441
}
440442
for _, tt := range tests {
441443
t.Run(tt.name, func(t *testing.T) {
444+
ctx, cancel := context.WithCancel(context.Background())
445+
defer cancel()
446+
442447
var registerPlugins []st.RegisterPluginFunc
443448
registeredPlugins := append(
444449
registerPlugins,
@@ -447,7 +452,7 @@ func TestReserve(t *testing.T) {
447452
)
448453

449454
fwk, err := st.NewFramework(
450-
registeredPlugins, "", wait.NeverStop,
455+
ctx, registeredPlugins, "",
451456
frameworkruntime.WithPodNominator(testutil.NewPodNominator(nil)),
452457
frameworkruntime.WithSnapshotSharedLister(testutil.NewFakeSharedLister(make([]*v1.Pod, 0), make([]*v1.Node, 0))),
453458
)
@@ -558,6 +563,9 @@ func TestUnreserve(t *testing.T) {
558563
}
559564
for _, tt := range tests {
560565
t.Run(tt.name, func(t *testing.T) {
566+
ctx, cancel := context.WithCancel(context.Background())
567+
defer cancel()
568+
561569
var registerPlugins []st.RegisterPluginFunc
562570
registeredPlugins := append(
563571
registerPlugins,
@@ -566,7 +574,7 @@ func TestUnreserve(t *testing.T) {
566574
)
567575

568576
fwk, err := st.NewFramework(
569-
registeredPlugins, "", wait.NeverStop,
577+
ctx, registeredPlugins, "",
570578
frameworkruntime.WithPodNominator(testutil.NewPodNominator(nil)),
571579
frameworkruntime.WithSnapshotSharedLister(testutil.NewFakeSharedLister(make([]*v1.Pod, 0), make([]*v1.Node, 0))),
572580
)
@@ -713,11 +721,12 @@ func TestDryRunPreemption(t *testing.T) {
713721
registeredPlugins := makeRegisteredPlugin()
714722

715723
cs := clientsetfake.NewSimpleClientset()
716-
ctx := context.Background()
724+
ctx, cancel := context.WithCancel(context.Background())
725+
defer cancel()
717726
fwk, err := st.NewFramework(
727+
ctx,
718728
registeredPlugins,
719729
"default-scheduler",
720-
ctx.Done(),
721730
frameworkruntime.WithClientSet(cs),
722731
frameworkruntime.WithEventRecorder(&events.FakeRecorder{}),
723732
frameworkruntime.WithPodNominator(testutil.NewPodNominator(nil)),
@@ -960,12 +969,13 @@ func TestPodEligibleToPreemptOthers(t *testing.T) {
960969
t.Run(tt.name, func(t *testing.T) {
961970
registeredPlugins := makeRegisteredPlugin()
962971
cs := clientsetfake.NewSimpleClientset()
963-
ctx := context.Background()
972+
ctx, cancel := context.WithCancel(context.Background())
973+
defer cancel()
964974

965975
fwk, err := st.NewFramework(
976+
ctx,
966977
registeredPlugins,
967978
"default-scheduler",
968-
ctx.Done(),
969979
frameworkruntime.WithClientSet(cs),
970980
frameworkruntime.WithEventRecorder(&events.FakeRecorder{}),
971981
frameworkruntime.WithPodNominator(testutil.NewPodNominator(nil)),
@@ -1116,6 +1126,9 @@ func TestAddElasticQuota(t *testing.T) {
11161126
}
11171127
for _, tt := range tests {
11181128
t.Run(tt.name, func(t *testing.T) {
1129+
ctx, cancel := context.WithCancel(context.Background())
1130+
defer cancel()
1131+
11191132
var registerPlugins []st.RegisterPluginFunc
11201133
registeredPlugins := append(
11211134
registerPlugins,
@@ -1124,7 +1137,7 @@ func TestAddElasticQuota(t *testing.T) {
11241137
)
11251138

11261139
fwk, err := st.NewFramework(
1127-
registeredPlugins, "", wait.NeverStop,
1140+
ctx, registeredPlugins, "",
11281141
frameworkruntime.WithPodNominator(testutil.NewPodNominator(nil)),
11291142
frameworkruntime.WithSnapshotSharedLister(testutil.NewFakeSharedLister(make([]*v1.Pod, 0), make([]*v1.Node, 0))),
11301143
)
@@ -1186,6 +1199,9 @@ func TestUpdateElasticQuota(t *testing.T) {
11861199
}
11871200
for _, tt := range tests {
11881201
t.Run(tt.name, func(t *testing.T) {
1202+
ctx, cancel := context.WithCancel(context.Background())
1203+
defer cancel()
1204+
11891205
var registerPlugins []st.RegisterPluginFunc
11901206
registeredPlugins := append(
11911207
registerPlugins,
@@ -1194,7 +1210,7 @@ func TestUpdateElasticQuota(t *testing.T) {
11941210
)
11951211

11961212
fwk, err := st.NewFramework(
1197-
registeredPlugins, "", wait.NeverStop,
1213+
ctx, registeredPlugins, "",
11981214
frameworkruntime.WithPodNominator(testutil.NewPodNominator(nil)),
11991215
frameworkruntime.WithSnapshotSharedLister(testutil.NewFakeSharedLister(make([]*v1.Pod, 0), make([]*v1.Node, 0))),
12001216
)
@@ -1235,6 +1251,9 @@ func TestDeleteElasticQuota(t *testing.T) {
12351251
}
12361252
for _, tt := range tests {
12371253
t.Run(tt.name, func(t *testing.T) {
1254+
ctx, cancel := context.WithCancel(context.Background())
1255+
defer cancel()
1256+
12381257
var registerPlugins []st.RegisterPluginFunc
12391258
registeredPlugins := append(
12401259
registerPlugins,
@@ -1243,7 +1262,7 @@ func TestDeleteElasticQuota(t *testing.T) {
12431262
)
12441263

12451264
fwk, err := st.NewFramework(
1246-
registeredPlugins, "", wait.NeverStop,
1265+
ctx, registeredPlugins, "",
12471266
frameworkruntime.WithPodNominator(testutil.NewPodNominator(nil)),
12481267
frameworkruntime.WithSnapshotSharedLister(testutil.NewFakeSharedLister(make([]*v1.Pod, 0), make([]*v1.Node, 0))),
12491268
)
@@ -1310,6 +1329,9 @@ func TestAddPod(t *testing.T) {
13101329
}
13111330
for _, tt := range tests {
13121331
t.Run(tt.name, func(t *testing.T) {
1332+
ctx, cancel := context.WithCancel(context.Background())
1333+
defer cancel()
1334+
13131335
var registerPlugins []st.RegisterPluginFunc
13141336
registeredPlugins := append(
13151337
registerPlugins,
@@ -1318,7 +1340,7 @@ func TestAddPod(t *testing.T) {
13181340
)
13191341

13201342
fwk, err := st.NewFramework(
1321-
registeredPlugins, "", wait.NeverStop,
1343+
ctx, registeredPlugins, "",
13221344
frameworkruntime.WithPodNominator(testutil.NewPodNominator(nil)),
13231345
frameworkruntime.WithSnapshotSharedLister(testutil.NewFakeSharedLister(make([]*v1.Pod, 0), make([]*v1.Node, 0))),
13241346
)
@@ -1419,6 +1441,9 @@ func TestUpdatePod(t *testing.T) {
14191441
}
14201442
for _, tt := range tests {
14211443
t.Run(tt.name, func(t *testing.T) {
1444+
ctx, cancel := context.WithCancel(context.Background())
1445+
defer cancel()
1446+
14221447
var registerPlugins []st.RegisterPluginFunc
14231448
registeredPlugins := append(
14241449
registerPlugins,
@@ -1427,7 +1452,7 @@ func TestUpdatePod(t *testing.T) {
14271452
)
14281453

14291454
fwk, err := st.NewFramework(
1430-
registeredPlugins, "", wait.NeverStop,
1455+
ctx, registeredPlugins, "",
14311456
frameworkruntime.WithPodNominator(testutil.NewPodNominator(nil)),
14321457
frameworkruntime.WithSnapshotSharedLister(testutil.NewFakeSharedLister(make([]*v1.Pod, 0), make([]*v1.Node, 0))),
14331458
)
@@ -1533,6 +1558,9 @@ func TestDeletePod(t *testing.T) {
15331558
}
15341559
for _, tt := range tests {
15351560
t.Run(tt.name, func(t *testing.T) {
1561+
ctx, cancel := context.WithCancel(context.Background())
1562+
defer cancel()
1563+
15361564
var registerPlugins []st.RegisterPluginFunc
15371565
registeredPlugins := append(
15381566
registerPlugins,
@@ -1541,7 +1569,7 @@ func TestDeletePod(t *testing.T) {
15411569
)
15421570

15431571
fwk, err := st.NewFramework(
1544-
registeredPlugins, "", wait.NeverStop,
1572+
ctx, registeredPlugins, "",
15451573
frameworkruntime.WithPodNominator(testutil.NewPodNominator(nil)),
15461574
frameworkruntime.WithSnapshotSharedLister(testutil.NewFakeSharedLister(make([]*v1.Pod, 0), make([]*v1.Node, 0))),
15471575
)

‎pkg/coscheduling/coscheduling_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func TestPodGroupBackoffTime(t *testing.T) {
101101
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
102102
st.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
103103
}
104-
f, err := st.NewFramework(registeredPlugins, "default-scheduler", ctx.Done(), fwkruntime.WithInformerFactory(informerFactory))
104+
f, err := st.NewFramework(ctx, registeredPlugins, "default-scheduler", fwkruntime.WithInformerFactory(informerFactory))
105105
if err != nil {
106106
t.Fatal(err)
107107
}
@@ -494,7 +494,7 @@ func TestPermit(t *testing.T) {
494494
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
495495
st.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
496496
}
497-
f, err := st.NewFramework(registeredPlugins, "default-scheduler", ctx.Done())
497+
f, err := st.NewFramework(ctx, registeredPlugins, "default-scheduler")
498498
if err != nil {
499499
t.Fatal(err)
500500
}
@@ -597,7 +597,7 @@ func TestPostFilter(t *testing.T) {
597597
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
598598
st.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
599599
}
600-
f, err := st.NewFramework(registeredPlugins, "default-scheduler", ctx.Done())
600+
f, err := st.NewFramework(ctx, registeredPlugins, "default-scheduler")
601601
if err != nil {
602602
t.Fatal(err)
603603
}

‎pkg/networkaware/networkoverhead/networkoverhead_test.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,8 @@ func BenchmarkNetworkOverheadPreFilter(b *testing.B) {
511511
client := builder.Build()
512512

513513
// create plugin
514-
ctx := context.Background()
514+
ctx, cancel := context.WithCancel(context.Background())
515+
defer cancel()
515516

516517
snapshot := newTestSharedLister(nil, nodes)
517518

@@ -532,7 +533,7 @@ func BenchmarkNetworkOverheadPreFilter(b *testing.B) {
532533
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
533534
}
534535

535-
fh, _ := st.NewFramework(registeredPlugins, "default-scheduler", ctx.Done(), schedruntime.WithClientSet(cs),
536+
fh, _ := st.NewFramework(ctx, registeredPlugins, "default-scheduler", schedruntime.WithClientSet(cs),
536537
schedruntime.WithInformerFactory(informerFactory), schedruntime.WithSnapshotSharedLister(snapshot))
537538

538539
pl := &NetworkOverhead{
@@ -752,7 +753,7 @@ func TestNetworkOverheadScore(t *testing.T) {
752753
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
753754
}
754755

755-
fh, _ := st.NewFramework(registeredPlugins, "default-scheduler", ctx.Done(), schedruntime.WithClientSet(cs),
756+
fh, _ := st.NewFramework(ctx, registeredPlugins, "default-scheduler", schedruntime.WithClientSet(cs),
756757
schedruntime.WithInformerFactory(informerFactory), schedruntime.WithSnapshotSharedLister(snapshot))
757758

758759
pl := &NetworkOverhead{
@@ -999,7 +1000,7 @@ func BenchmarkNetworkOverheadScore(b *testing.B) {
9991000
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
10001001
}
10011002

1002-
fh, _ := st.NewFramework(registeredPlugins, "default-scheduler", ctx.Done(), schedruntime.WithClientSet(cs),
1003+
fh, _ := st.NewFramework(ctx, registeredPlugins, "default-scheduler", schedruntime.WithClientSet(cs),
10031004
schedruntime.WithInformerFactory(informerFactory), schedruntime.WithSnapshotSharedLister(snapshot))
10041005

10051006
pl := &NetworkOverhead{
@@ -1228,7 +1229,7 @@ func TestNetworkOverheadFilter(t *testing.T) {
12281229
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
12291230
}
12301231

1231-
fh, _ := st.NewFramework(registeredPlugins, "default-scheduler", ctx.Done(),
1232+
fh, _ := st.NewFramework(ctx, registeredPlugins, "default-scheduler",
12321233
schedruntime.WithClientSet(cs),
12331234
schedruntime.WithInformerFactory(informerFactory),
12341235
schedruntime.WithSnapshotSharedLister(snapshot))
@@ -1454,7 +1455,7 @@ func BenchmarkNetworkOverheadFilter(b *testing.B) {
14541455
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
14551456
}
14561457

1457-
fh, _ := st.NewFramework(registeredPlugins, "default-scheduler", ctx.Done(),
1458+
fh, _ := st.NewFramework(ctx, registeredPlugins, "default-scheduler",
14581459
schedruntime.WithClientSet(cs),
14591460
schedruntime.WithInformerFactory(informerFactory),
14601461
schedruntime.WithSnapshotSharedLister(snapshot))

‎pkg/noderesources/allocatable_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
v1 "k8s.io/api/core/v1"
2525
"k8s.io/apimachinery/pkg/api/resource"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
27-
"k8s.io/apimachinery/pkg/util/wait"
2827
"k8s.io/client-go/informers"
2928
clientsetfake "k8s.io/client-go/kubernetes/fake"
3029
schedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
@@ -238,6 +237,9 @@ func TestNodeResourcesAllocatable(t *testing.T) {
238237

239238
for _, test := range tests {
240239
t.Run(test.name, func(t *testing.T) {
240+
ctx, cancel := context.WithCancel(context.Background())
241+
defer cancel()
242+
241243
cs := clientsetfake.NewSimpleClientset()
242244
informerFactory := informers.NewSharedInformerFactory(cs, 0)
243245
podInformer := informerFactory.Core().V1().Pods().Informer()
@@ -252,9 +254,9 @@ func TestNodeResourcesAllocatable(t *testing.T) {
252254
fakeSharedLister := &fakeSharedLister{nodes: test.nodeInfos}
253255

254256
fh, err := st.NewFramework(
257+
ctx,
255258
registeredPlugins,
256259
"default-scheduler",
257-
wait.NeverStop,
258260
frameworkruntime.WithClientSet(cs),
259261
frameworkruntime.WithInformerFactory(informerFactory),
260262
frameworkruntime.WithSnapshotSharedLister(fakeSharedLister),

‎pkg/podstate/pod_state_test.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ import (
2525
"k8s.io/api/core/v1"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/apimachinery/pkg/types"
28-
"k8s.io/apimachinery/pkg/util/wait"
2928
"k8s.io/client-go/informers"
3029
clientsetfake "k8s.io/client-go/kubernetes/fake"
30+
"k8s.io/klog/v2"
31+
"k8s.io/klog/v2/ktesting"
32+
3133
"k8s.io/kubernetes/pkg/scheduler/framework"
3234
fakeframework "k8s.io/kubernetes/pkg/scheduler/framework/fake"
3335
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder"
@@ -73,6 +75,8 @@ func TestPodState(t *testing.T) {
7375

7476
for _, test := range tests {
7577
t.Run(test.name, func(t *testing.T) {
78+
logger, ctx := ktesting.NewTestContext(t)
79+
7680
cs := clientsetfake.NewSimpleClientset()
7781
informerFactory := informers.NewSharedInformerFactory(cs, 0)
7882
registeredPlugins := []st.RegisterPluginFunc{
@@ -83,9 +87,9 @@ func TestPodState(t *testing.T) {
8387
fakeSharedLister := &fakeSharedLister{nodes: test.nodeInfos}
8488

8589
fh, err := st.NewFramework(
90+
ctx,
8691
registeredPlugins,
8792
"default-scheduler",
88-
wait.NeverStop,
8993
frameworkruntime.WithClientSet(cs),
9094
frameworkruntime.WithInformerFactory(informerFactory),
9195
frameworkruntime.WithSnapshotSharedLister(fakeSharedLister),
@@ -98,7 +102,7 @@ func TestPodState(t *testing.T) {
98102
for _, n := range test.nodeInfos {
99103
for _, pi := range n.Pods {
100104
if pi.Pod.Status.NominatedNodeName != "" {
101-
addNominatedPod(pi, n.Node().Name, fh)
105+
addNominatedPod(logger, pi, n.Node().Name, fh)
102106
}
103107
}
104108
}
@@ -183,8 +187,8 @@ func makeRegularPod(name string) *v1.Pod {
183187
}
184188
}
185189

186-
func addNominatedPod(pi *framework.PodInfo, nodeName string, fh framework.Handle) *framework.PodInfo {
187-
fh.AddNominatedPod(pi, &framework.NominatingInfo{NominatingMode: framework.ModeOverride, NominatedNodeName: nodeName})
190+
func addNominatedPod(logger klog.Logger, pi *framework.PodInfo, nodeName string, fh framework.Handle) *framework.PodInfo {
191+
fh.AddNominatedPod(logger, pi, &framework.NominatingInfo{NominatingMode: framework.ModeOverride, NominatedNodeName: nodeName})
188192
return pi
189193
}
190194

0 commit comments

Comments
 (0)