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

Rename KubernetesMesosScheduler.{Scheduler -> PodScheduler}

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2015-10-25 10:35:56 -07:00
parent 5db45baa8f
commit b600e6c497
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/mesos/pkg/scheduler/plugin_test.go
View File

@ -479,7 +479,7 @@ func newLifecycleTest(t *testing.T) lifecycleTest {
Host: apiServer.server.URL, Host: apiServer.server.URL,
Version: testapi.Default.Version(), Version: testapi.Default.Version(),
}), }),
Scheduler: NewFCFSPodScheduler(strategy, apiServer.LookupNode), PodScheduler: NewFCFSPodScheduler(strategy, apiServer.LookupNode),
Schedcfg: *schedcfg.CreateDefaultConfig(), Schedcfg: *schedcfg.CreateDefaultConfig(),
LookupNode: apiServer.LookupNode, LookupNode: apiServer.LookupNode,
}) })

4
contrib/mesos/pkg/scheduler/scheduler.go
View File

@ -111,7 +111,7 @@ type KubernetesMesosScheduler struct {
type Config struct { type Config struct {
Schedcfg schedcfg.Config Schedcfg schedcfg.Config
Executor *mesos.ExecutorInfo Executor *mesos.ExecutorInfo
Scheduler PodScheduler PodScheduler PodScheduler
Client *client.Client Client *client.Client
EtcdClient tools.EtcdClient EtcdClient tools.EtcdClient
FailoverTimeout float64 FailoverTimeout float64
@ -128,7 +128,7 @@ func New(config Config) *KubernetesMesosScheduler {
RWMutex: new(sync.RWMutex), RWMutex: new(sync.RWMutex),
executor: config.Executor, executor: config.Executor,
executorGroup: uid.Parse(config.Executor.ExecutorId.GetValue()).Group(), executorGroup: uid.Parse(config.Executor.ExecutorId.GetValue()).Group(),
PodScheduler: config.Scheduler, PodScheduler: config.PodScheduler,
client: config.Client, client: config.Client,
etcdClient: config.EtcdClient, etcdClient: config.EtcdClient,
failoverTimeout: config.FailoverTimeout, failoverTimeout: config.FailoverTimeout,

2
contrib/mesos/pkg/scheduler/service/service.go
View File

@ -720,7 +720,7 @@ func (s *SchedulerServer) bootstrap(hks hyperkube.Interface, sc *schedcfg.Config
mesosPodScheduler := scheduler.New(scheduler.Config{ mesosPodScheduler := scheduler.New(scheduler.Config{
Schedcfg: *sc, Schedcfg: *sc,
Executor: executor, Executor: executor,
Scheduler: fcfs, PodScheduler: fcfs,
Client: client, Client: client,
EtcdClient: etcdClient, EtcdClient: etcdClient,
FailoverTimeout: s.FailoverTimeout, FailoverTimeout: s.FailoverTimeout,