github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-12-08 02:15:27 +00:00
Code Issues Projects Releases Wiki Activity

refactor(scheduling): remove priorities package

Browse Source
This commit is contained in:
draveness
2020-01-09 14:29:38 +08:00
parent da9fdc933b
commit 2c3c6721ce
16 changed files with 65 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/scheduler/framework/plugins/serviceaffinity/service_affinity_test.go
View File

@@ -22,11 +22,8 @@ import (
"sort"
"testing"
apps "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/scheduler/algorithm/priorities"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/migration"
framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
fakelisters "k8s.io/kubernetes/pkg/scheduler/listers/fake"
"k8s.io/kubernetes/pkg/scheduler/nodeinfo"
@@ -382,11 +379,6 @@ func TestServiceAffinityScore(t *testing.T) {
name: "three pods, two service pods, with rack label",
},
}
// these local variables just make sure controllerLister\replicaSetLister\statefulSetLister not nil
// when construct metaDataProducer
sss := []*apps.StatefulSet{{Spec: apps.StatefulSetSpec{Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}}}}
rcs := []*v1.ReplicationController{{Spec: v1.ReplicationControllerSpec{Selector: map[string]string{"foo": "bar"}}}}
rss := []*apps.ReplicaSet{{Spec: apps.ReplicaSetSpec{Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}}}}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
@@ -401,14 +393,7 @@ func TestServiceAffinityScore(t *testing.T) {
AntiAffinityLabelsPreference: test.labels,
},
}
metaDataProducer := priorities.NewMetadataFactory(
fakelisters.ServiceLister(test.services),
fakelisters.ControllerLister(rcs),
fakelisters.ReplicaSetLister(rss),
fakelisters.StatefulSetLister(sss))
metaData := metaDataProducer(test.pod, nodes, snapshot)
state := framework.NewCycleState()
state.Write(migration.PrioritiesStateKey, &migration.PrioritiesStateData{Reference: metaData})
var gotList framework.NodeScoreList
for _, n := range makeLabeledNodeList(test.nodes) {