From 4d99ee7e54fc7f5af23eda23b014e323f2958655 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Wed, 4 Nov 2015 12:14:59 +0100 Subject: [PATCH] Rename NewScheduler -> New --- contrib/mesos/pkg/scheduler/components/scheduler.go | 2 +- contrib/mesos/pkg/scheduler/integration/integration_test.go | 2 +- contrib/mesos/pkg/scheduler/service/service.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/mesos/pkg/scheduler/components/scheduler.go b/contrib/mesos/pkg/scheduler/components/scheduler.go index 837629e4bab..98d6be7525e 100644 --- a/contrib/mesos/pkg/scheduler/components/scheduler.go +++ b/contrib/mesos/pkg/scheduler/components/scheduler.go @@ -53,7 +53,7 @@ type sched struct { taskRegistry podtask.Registry } -func NewScheduler(c *config.Config, fw framework.Framework, ps podschedulers.PodScheduler, +func New(c *config.Config, fw framework.Framework, ps podschedulers.PodScheduler, client *client.Client, recorder record.EventRecorder, terminate <-chan struct{}, mux *http.ServeMux, lw *cache.ListWatch) scheduler.Scheduler { core := &sched{ diff --git a/contrib/mesos/pkg/scheduler/integration/integration_test.go b/contrib/mesos/pkg/scheduler/integration/integration_test.go index 744a811d064..6bfb5130bf8 100644 --- a/contrib/mesos/pkg/scheduler/integration/integration_test.go +++ b/contrib/mesos/pkg/scheduler/integration/integration_test.go @@ -487,7 +487,7 @@ func newLifecycleTest(t *testing.T) lifecycleTest { // create scheduler eventObs := NewEventObserver() - scheduler := components.NewScheduler(&c, fw, fcfs, client, eventObs, schedulerProc.Terminal(), http.DefaultServeMux, &podsListWatch.ListWatch) + scheduler := components.New(&c, fw, fcfs, client, eventObs, schedulerProc.Terminal(), http.DefaultServeMux, &podsListWatch.ListWatch) assert.NotNil(scheduler) // create mock mesos scheduler driver diff --git a/contrib/mesos/pkg/scheduler/service/service.go b/contrib/mesos/pkg/scheduler/service/service.go index 2597a515efd..c0811b8384f 100644 --- a/contrib/mesos/pkg/scheduler/service/service.go +++ b/contrib/mesos/pkg/scheduler/service/service.go @@ -766,7 +766,7 @@ func (s *SchedulerServer) bootstrap(hks hyperkube.Interface, sc *schedcfg.Config // create scheduler loop lw := cache.NewListWatchFromClient(client, "pods", api.NamespaceAll, fields.Everything()) - sched := components.NewScheduler(sc, framework, fcfs, client, recorder, schedulerProcess.Terminal(), s.mux, lw) + sched := components.New(sc, framework, fcfs, client, recorder, schedulerProcess.Terminal(), s.mux, lw) runtime.On(framework.Registration(), func() { sched.Run(schedulerProcess.Terminal()) }) runtime.On(framework.Registration(), s.newServiceWriter(schedulerProcess.Terminal()))