Merge pull request kubernetes#5544 from piosz/fix

brendandburns · brendandburns · commit 2a9c3080edf7 · 2015-03-17T07:32:55.000-07:00
Fill NodeInfo in CreateFromKey method in scheduler
diff --git a/plugin/pkg/scheduler/factory/factory.go b/plugin/pkg/scheduler/factory/factory.go
@@ -110,6 +110,7 @@ func (f *ConfigFactory) CreateFromKeys(predicateKeys, priorityKeys util.StringSe
 		PodLister:     f.PodLister,
 		ServiceLister: f.ServiceLister,
 		NodeLister:    f.NodeLister,
+		NodeInfo:      f.NodeLister,
 	}
 	predicateFuncs, err := getFitPredicateFunctions(predicateKeys, pluginArgs)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ func (f *ConfigFactory) CreateFromKeys(predicateKeys, priorityKeys util.StringSe`
`110`	`110`	`PodLister: f.PodLister,`
`111`	`111`	`ServiceLister: f.ServiceLister,`
`112`	`112`	`NodeLister: f.NodeLister,`
	`113`	`+ NodeInfo: f.NodeLister,`
`113`	`114`	`}`
`114`	`115`	`predicateFuncs, err := getFitPredicateFunctions(predicateKeys, pluginArgs)`
`115`	`116`	`if err != nil {`