github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13785 from wojtek-t/minion_to_node_2

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-09-14 23:23:06 -07:00
parent dc1561fbca 53ae56f205
commit bf641078eb
36 changed files with 339 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/pkg/scheduler/factory/factory_test.go
View File

@@ -122,11 +122,11 @@ func PredicateTwo(pod *api.Pod, existingPods []*api.Pod, node string) (bool, err
return true, nil
}
func PriorityOne(pod *api.Pod, podLister algorithm.PodLister, minionLister algorithm.MinionLister) (algorithm.HostPriorityList, error) {
func PriorityOne(pod *api.Pod, podLister algorithm.PodLister, nodeLister algorithm.NodeLister) (algorithm.HostPriorityList, error) {
return []algorithm.HostPriority{}, nil
}
func PriorityTwo(pod *api.Pod, podLister algorithm.PodLister, minionLister algorithm.MinionLister) (algorithm.HostPriorityList, error) {
func PriorityTwo(pod *api.Pod, podLister algorithm.PodLister, nodeLister algorithm.NodeLister) (algorithm.HostPriorityList, error) {
return []algorithm.HostPriority{}, nil
}
@@ -179,7 +179,7 @@ func TestDefaultErrorFunc(t *testing.T) {
}
}
func TestMinionEnumerator(t *testing.T) {
func TestNodeEnumerator(t *testing.T) {
testList := &api.NodeList{
Items: []api.Node{
{ObjectMeta: api.ObjectMeta{Name: "foo"}},