diff --git a/pkg/scheduler/extender_test.go b/pkg/scheduler/extender_test.go index 9a4e6331ced..97f148f52db 100644 --- a/pkg/scheduler/extender_test.go +++ b/pkg/scheduler/extender_test.go @@ -27,6 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/informers" clientsetfake "k8s.io/client-go/kubernetes/fake" + "k8s.io/klog/v2/ktesting" extenderv1 "k8s.io/kube-scheduler/extender/v1" schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/framework" @@ -278,7 +279,8 @@ func TestSchedulerWithExtenders(t *testing.T) { for ii := range test.extenders { extenders = append(extenders, &test.extenders[ii]) } - ctx, cancel := context.WithCancel(context.Background()) + logger, ctx := ktesting.NewTestContext(t) + ctx, cancel := context.WithCancel(ctx) defer cancel() cache := internalcache.New(time.Duration(0), ctx.Done()) @@ -290,6 +292,7 @@ func TestSchedulerWithExtenders(t *testing.T) { runtime.WithClientSet(client), runtime.WithInformerFactory(informerFactory), runtime.WithPodNominator(internalqueue.NewPodNominator(informerFactory.Core().V1().Pods().Lister())), + runtime.WithLogger(logger), ) if err != nil { t.Fatal(err) diff --git a/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption_test.go b/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption_test.go index d2fb9c4227d..496f5bd4a64 100644 --- a/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption_test.go +++ b/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption_test.go @@ -352,7 +352,8 @@ func TestPostFilter(t *testing.T) { if tt.extender != nil { extenders = append(extenders, tt.extender) } - ctx, cancel := context.WithCancel(context.Background()) + logger, ctx := ktesting.NewTestContext(t) + ctx, cancel := context.WithCancel(ctx) defer cancel() f, err := st.NewFramework(registeredPlugins, "", ctx.Done(), frameworkruntime.WithClientSet(cs), @@ -361,6 +362,7 @@ func TestPostFilter(t *testing.T) { frameworkruntime.WithPodNominator(internalqueue.NewPodNominator(informerFactory.Core().V1().Pods().Lister())), frameworkruntime.WithExtenders(extenders), frameworkruntime.WithSnapshotSharedLister(internalcache.NewSnapshot(tt.pods, tt.nodes)), + frameworkruntime.WithLogger(logger), ) if err != nil { t.Fatal(err) @@ -1087,7 +1089,8 @@ func TestDryRunPreemption(t *testing.T) { parallelism = 1 } - ctx, cancel := context.WithCancel(context.Background()) + logger, ctx := ktesting.NewTestContext(t) + ctx, cancel := context.WithCancel(ctx) defer cancel() fwk, err := st.NewFramework( registeredPlugins, "", ctx.Done(), @@ -1095,6 +1098,7 @@ func TestDryRunPreemption(t *testing.T) { frameworkruntime.WithSnapshotSharedLister(snapshot), frameworkruntime.WithInformerFactory(informerFactory), frameworkruntime.WithParallelism(parallelism), + frameworkruntime.WithLogger(logger), ) if err != nil { t.Fatal(err) @@ -1351,6 +1355,7 @@ func TestSelectBestCandidate(t *testing.T) { ctx.Done(), frameworkruntime.WithPodNominator(internalqueue.NewPodNominator(informerFactory.Core().V1().Pods().Lister())), frameworkruntime.WithSnapshotSharedLister(snapshot), + frameworkruntime.WithLogger(logger), ) if err != nil { t.Fatal(err) @@ -1480,6 +1485,7 @@ func TestPodEligibleToPreemptOthers(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { + logger, _ := ktesting.NewTestContext(t) var nodes []*v1.Node for _, n := range test.nodes { nodes = append(nodes, st.MakeNode().Name(n).Obj()) @@ -1492,6 +1498,7 @@ func TestPodEligibleToPreemptOthers(t *testing.T) { defer close(stopCh) f, err := st.NewFramework(registeredPlugins, "", stopCh, frameworkruntime.WithSnapshotSharedLister(internalcache.NewSnapshot(test.pods, nodes)), + frameworkruntime.WithLogger(logger), ) if err != nil { t.Fatal(err) @@ -1689,7 +1696,8 @@ func TestPreempt(t *testing.T) { return true, nil, nil }) - ctx, cancel := context.WithCancel(context.Background()) + logger, ctx := ktesting.NewTestContext(t) + ctx, cancel := context.WithCancel(ctx) defer cancel() cache := internalcache.New(time.Duration(0), ctx.Done()) @@ -1735,6 +1743,7 @@ func TestPreempt(t *testing.T) { frameworkruntime.WithPodNominator(internalqueue.NewPodNominator(informerFactory.Core().V1().Pods().Lister())), frameworkruntime.WithSnapshotSharedLister(internalcache.NewSnapshot(test.pods, nodes)), frameworkruntime.WithInformerFactory(informerFactory), + frameworkruntime.WithLogger(logger), ) if err != nil { t.Fatal(err) diff --git a/pkg/scheduler/framework/preemption/preemption_test.go b/pkg/scheduler/framework/preemption/preemption_test.go index 345d75a8482..d248857e59e 100644 --- a/pkg/scheduler/framework/preemption/preemption_test.go +++ b/pkg/scheduler/framework/preemption/preemption_test.go @@ -29,6 +29,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/informers" clientsetfake "k8s.io/client-go/kubernetes/fake" + "k8s.io/klog/v2/ktesting" extenderv1 "k8s.io/kube-scheduler/extender/v1" "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/parallelize" @@ -266,6 +267,7 @@ func TestDryRunPreemption(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { + logger, _ := ktesting.NewTestContext(t) registeredPlugins := append([]st.RegisterPluginFunc{ st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New)}, st.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New), @@ -287,6 +289,7 @@ func TestDryRunPreemption(t *testing.T) { frameworkruntime.WithInformerFactory(informerFactory), frameworkruntime.WithParallelism(parallelism), frameworkruntime.WithSnapshotSharedLister(internalcache.NewSnapshot(tt.testPods, tt.nodes)), + frameworkruntime.WithLogger(logger), ) if err != nil { t.Fatal(err)