feat: remove node general update event from EventsToRegister when QHint is enabled

This commit is contained in:
Kensei Nakada
2024-09-08 14:54:46 +09:00
parent f0f7ff989a
commit fe3ab649d0
26 changed files with 270 additions and 167 deletions

View File

@@ -31,7 +31,9 @@ import (
"k8s.io/kubernetes/pkg/scheduler/apis/config"
"k8s.io/kubernetes/pkg/scheduler/backend/cache"
"k8s.io/kubernetes/pkg/scheduler/framework"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature"
plugintesting "k8s.io/kubernetes/pkg/scheduler/framework/plugins/testing"
schedruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime"
st "k8s.io/kubernetes/pkg/scheduler/testing"
tf "k8s.io/kubernetes/pkg/scheduler/testing/framework"
)
@@ -267,9 +269,10 @@ func TestSingleZone(t *testing.T) {
node := &framework.NodeInfo{}
node.SetNode(test.Node)
p := &VolumeZone{
pvLister,
pvcLister,
nil,
pvLister: pvLister,
pvcLister: pvcLister,
scLister: nil,
enableSchedulingQueueHint: false,
}
_, preFilterStatus := p.PreFilter(ctx, state, test.Pod)
if diff := cmp.Diff(preFilterStatus, test.wantPreFilterStatus); diff != "" {
@@ -399,9 +402,10 @@ func TestMultiZone(t *testing.T) {
node := &framework.NodeInfo{}
node.SetNode(test.Node)
p := &VolumeZone{
pvLister,
pvcLister,
nil,
pvLister: pvLister,
pvcLister: pvcLister,
scLister: nil,
enableSchedulingQueueHint: false,
}
_, preFilterStatus := p.PreFilter(ctx, state, test.Pod)
if diff := cmp.Diff(preFilterStatus, test.wantPreFilterStatus); diff != "" {
@@ -524,9 +528,10 @@ func TestWithBinding(t *testing.T) {
node := &framework.NodeInfo{}
node.SetNode(test.Node)
p := &VolumeZone{
pvLister,
pvcLister,
scLister,
pvLister: pvLister,
pvcLister: pvcLister,
scLister: scLister,
enableSchedulingQueueHint: false,
}
_, preFilterStatus := p.PreFilter(ctx, state, test.Pod)
if diff := cmp.Diff(preFilterStatus, test.wantPreFilterStatus); diff != "" {
@@ -841,7 +846,7 @@ func newPluginWithListers(ctx context.Context, tb testing.TB, pods []*v1.Pod, no
for _, pv := range pvs {
objects = append(objects, pv)
}
return plugintesting.SetupPluginWithInformers(ctx, tb, New, &config.InterPodAffinityArgs{}, snapshot, objects)
return plugintesting.SetupPluginWithInformers(ctx, tb, schedruntime.FactoryAdapter(feature.Features{}, New), &config.InterPodAffinityArgs{}, snapshot, objects)
}
func makePVsWithZoneLabel(num int) []*v1.PersistentVolume {