github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-12-01 17:44:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #92876 from Huang-Wei/pdbLister

Browse Source 
Add pdbLister as a member field of struct DefaultPreemption
This commit is contained in:
Kubernetes Prow Robot
2020-07-11 20:57:42 -07:00
committed by GitHub
parent c23a4b08d7 9d377eb655
commit d06ff65943
3 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/scheduler/framework/plugins/defaultpreemption/default_preemption_test.go
View File

@@ -221,7 +221,6 @@ func TestPostFilter(t *testing.T) {
if err != nil {
t.Fatal(err)
}
p := DefaultPreemption{fh: f}
state := framework.NewCycleState()
// Ensure <state> is populated.
@@ -229,6 +228,10 @@ func TestPostFilter(t *testing.T) {
t.Errorf("Unexpected PreFilter Status: %v", status)
}
p := DefaultPreemption{
fh: f,
pdbLister: getPDBLister(informerFactory),
}
gotResult, gotStatus := p.PostFilter(context.TODO(), state, tt.pod, tt.filteredNodesStatuses)
if !reflect.DeepEqual(gotStatus, tt.wantStatus) {
t.Errorf("Status does not match: %v, want: %v", gotStatus, tt.wantStatus)
@@ -1236,6 +1239,7 @@ func TestPreempt(t *testing.T) {
extenders = append(extenders, extender)
}
informerFactory := informers.NewSharedInformerFactory(client, 0)
fwk, err := st.NewFramework(
[]st.RegisterPluginFunc{
test.registerPlugin,
@@ -1247,7 +1251,7 @@ func TestPreempt(t *testing.T) {
frameworkruntime.WithExtenders(extenders),
frameworkruntime.WithPodNominator(internalqueue.NewPodNominator()),
frameworkruntime.WithSnapshotSharedLister(internalcache.NewSnapshot(test.pods, nodes)),
frameworkruntime.WithInformerFactory(informers.NewSharedInformerFactory(client, 0)),
frameworkruntime.WithInformerFactory(informerFactory),
)
if err != nil {
t.Fatal(err)
@@ -1260,7 +1264,11 @@ func TestPreempt(t *testing.T) {
t.Errorf("Unexpected preFilterStatus: %v", preFilterStatus)
}
// Call preempt and check the expected results.
node, err := preempt(context.Background(), fwk, state, test.pod, make(framework.NodeToStatusMap))
pl := DefaultPreemption{
fh: fwk,
pdbLister: getPDBLister(informerFactory),
}
node, err := pl.preempt(context.Background(), state, test.pod, make(framework.NodeToStatusMap))
if err != nil {
t.Errorf("unexpected error in preemption: %v", err)
}
@@ -1298,7 +1306,7 @@ func TestPreempt(t *testing.T) {
}
// Call preempt again and make sure it doesn't preempt any more pods.
node, err = preempt(context.Background(), fwk, state, test.pod, make(framework.NodeToStatusMap))
node, err = pl.preempt(context.Background(), state, test.pod, make(framework.NodeToStatusMap))
if err != nil {
t.Errorf("unexpected error in preemption: %v", err)
}