Merge pull request #2825 from mikedanese/scheduler-factory-plugins

Scheduler plugin configuration
This commit is contained in:
bgrant0607
2014-12-18 07:12:01 -08:00
9 changed files with 329 additions and 102 deletions

View File

@@ -38,6 +38,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler"
_ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithmprovider"
"github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/factory"
"github.com/golang/glog"
@@ -105,7 +106,7 @@ func RunApiServer(cl *client.Client, etcdClient tools.EtcdClient, addr string, p
func RunScheduler(cl *client.Client) {
// Scheduler
schedulerConfigFactory := factory.NewConfigFactory(cl)
schedulerConfig, err := schedulerConfigFactory.Create(nil, nil)
schedulerConfig, err := schedulerConfigFactory.Create()
if err != nil {
glog.Fatal("Couldn't create scheduler config: %v", err)
}