github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #143 from jjhuff/fix_scheduler_panic

Browse Source 
FirstFitScheduler was triggering a panic by passing nil as the query to EtcdRegistry.ListPods
This commit is contained in:
brendandburns 2014-06-17 17:33:17 -07:00
commit a3036d2c81
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/registry/scheduler.go
View File

@ -20,6 +20,7 @@ import (
"math/rand"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
)
// Scheduler is an interface implemented by things that know how to schedule pods onto machines.
@ -90,7 +91,7 @@ func (s *FirstFitScheduler) containsPort(pod api.Pod, port api.Port) bool {
func (s *FirstFitScheduler) Schedule(pod api.Pod) (string, error) {
machineToPods := map[string][]api.Pod{}
pods, err := s.registry.ListPods(nil)
pods, err := s.registry.ListPods(labels.Everything())
if err != nil {
return "", err
}