Rename KubernetesMesosScheduler.{Scheduler -> PodScheduler}

contrib/mesos/pkg/scheduler/plugin_test.go

@@ -479,9 +479,9 @@ func newLifecycleTest(t *testing.T) lifecycleTest {
 			Host:    apiServer.server.URL,
 			Version: testapi.Default.Version(),
 		}),
-		Scheduler:  NewFCFSPodScheduler(strategy, apiServer.LookupNode),
-		Schedcfg:   *schedcfg.CreateDefaultConfig(),
-		LookupNode: apiServer.LookupNode,
+		PodScheduler: NewFCFSPodScheduler(strategy, apiServer.LookupNode),
+		Schedcfg:     *schedcfg.CreateDefaultConfig(),
+		LookupNode:   apiServer.LookupNode,
 	})
 
 	assert.NotNil(mesosScheduler.client, "client is nil")

contrib/mesos/pkg/scheduler/scheduler.go

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

contrib/mesos/pkg/scheduler/service/service.go

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