github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make scheduler implementation private

pull/6/head
Dr. Stefan Schimanski 2015-11-03 08:11:17 +01:00
parent ef0a512c15
commit 835961ac43
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -430,7 +430,7 @@ type lifecycleTest struct {
podsListWatch *MockPodsListWatch podsListWatch *MockPodsListWatch
framework framework.Framework framework framework.Framework
schedulerProc *ha.SchedulerProcess schedulerProc *ha.SchedulerProcess
scheduler *Scheduler scheduler *scheduler
t *testing.T t *testing.T
} }

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

@ -35,6 +35,7 @@ import (
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podschedulers" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podschedulers"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/queuer" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/queuer"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/types"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/record"
@ -42,7 +43,7 @@ import (
) )
// Scheduler implements types.Scheduler // Scheduler implements types.Scheduler
type Scheduler struct { type scheduler struct {
podReconciler podreconciler.PodReconciler podReconciler podreconciler.PodReconciler
framework framework.Framework framework framework.Framework
loop schedulerloop.SchedulerLoop loop schedulerloop.SchedulerLoop
@ -53,9 +54,9 @@ type Scheduler struct {
} }
func NewScheduler(c *config.Config, fw framework.Framework, ps podschedulers.PodScheduler, func NewScheduler(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 { client *client.Client, recorder record.EventRecorder, terminate <-chan struct{}, mux *http.ServeMux, lw *cache.ListWatch) types.Scheduler {
core := &Scheduler{ core := &scheduler{
framework: fw, framework: fw,
taskRegistry: podtask.NewInMemoryRegistry(), taskRegistry: podtask.NewInMemoryRegistry(),
} }
@ -95,26 +96,26 @@ func NewScheduler(c *config.Config, fw framework.Framework, ps podschedulers.Pod
return core return core
} }
func (c *Scheduler) Run(done <-chan struct{}) { func (c *scheduler) Run(done <-chan struct{}) {
c.loop.Run(done) c.loop.Run(done)
} }
func (c *Scheduler) Reconcile(t *podtask.T) { func (c *scheduler) Reconcile(t *podtask.T) {
c.podReconciler.Reconcile(t) c.podReconciler.Reconcile(t)
} }
func (c *Scheduler) Tasks() podtask.Registry { func (c *scheduler) Tasks() podtask.Registry {
return c.taskRegistry return c.taskRegistry
} }
func (c *Scheduler) Offers() offers.Registry { func (c *scheduler) Offers() offers.Registry {
return c.framework.Offers() return c.framework.Offers()
} }
func (c *Scheduler) KillTask(id string) error { func (c *scheduler) KillTask(id string) error {
return c.framework.KillTask(id) return c.framework.KillTask(id)
} }
func (c *Scheduler) LaunchTask(t *podtask.T) error { func (c *scheduler) LaunchTask(t *podtask.T) error {
return c.framework.LaunchTask(t) return c.framework.LaunchTask(t)
} }