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

scheduler: use New rather than Make for construction helpers.

Browse Source
This commit is contained in:
Burcu Dogan 2014-07-10 22:56:14 -07:00
parent e4d966744d
commit 6a2703627b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/master/master.go
View File

@ -84,7 +84,7 @@ func (m *Master) init(cloud cloudprovider.Interface, podInfoGetter client.PodInf
m.random = rand.New(rand.NewSource(int64(time.Now().Nanosecond()))) m.random = rand.New(rand.NewSource(int64(time.Now().Nanosecond())))
podCache := NewPodCache(podInfoGetter, m.podRegistry, time.Second*30) podCache := NewPodCache(podInfoGetter, m.podRegistry, time.Second*30)
go podCache.Loop() go podCache.Loop()
s := scheduler.MakeFirstFitScheduler(m.podRegistry, m.random) s := scheduler.NewFirstFitScheduler(m.podRegistry, m.random)
m.storage = map[string]apiserver.RESTStorage{ m.storage = map[string]apiserver.RESTStorage{
"pods": registry.MakePodRegistryStorage(m.podRegistry, podInfoGetter, s, m.minionRegistry, cloud, podCache), "pods": registry.MakePodRegistryStorage(m.podRegistry, podInfoGetter, s, m.minionRegistry, cloud, podCache),
"replicationControllers": registry.MakeControllerRegistryStorage(m.controllerRegistry, m.podRegistry), "replicationControllers": registry.MakeControllerRegistryStorage(m.controllerRegistry, m.podRegistry),

2
pkg/scheduler/firstfit.go
View File

@ -30,7 +30,7 @@ type FirstFitScheduler struct {
random *rand.Rand random *rand.Rand
} }
func MakeFirstFitScheduler(podLister PodLister, random *rand.Rand) Scheduler { func NewFirstFitScheduler(podLister PodLister, random *rand.Rand) Scheduler {
return &FirstFitScheduler{ return &FirstFitScheduler{
podLister: podLister, podLister: podLister,
random: random, random: random,

8
pkg/scheduler/firstfit_test.go
View File

@ -28,7 +28,7 @@ func TestFirstFitSchedulerNothingScheduled(t *testing.T) {
r := rand.New(rand.NewSource(0)) r := rand.New(rand.NewSource(0))
st := schedulerTester{ st := schedulerTester{
t: t, t: t,
scheduler: MakeFirstFitScheduler(&fakeRegistry, r), scheduler: NewFirstFitScheduler(&fakeRegistry, r),
minionLister: FakeMinionLister{"m1", "m2", "m3"}, minionLister: FakeMinionLister{"m1", "m2", "m3"},
} }
st.expectSchedule(api.Pod{}, "m3") st.expectSchedule(api.Pod{}, "m3")
@ -41,7 +41,7 @@ func TestFirstFitSchedulerFirstScheduled(t *testing.T) {
r := rand.New(rand.NewSource(0)) r := rand.New(rand.NewSource(0))
st := schedulerTester{ st := schedulerTester{
t: t, t: t,
scheduler: MakeFirstFitScheduler(fakeRegistry, r), scheduler: NewFirstFitScheduler(fakeRegistry, r),
minionLister: FakeMinionLister{"m1", "m2", "m3"}, minionLister: FakeMinionLister{"m1", "m2", "m3"},
} }
st.expectSchedule(makePod("", 8080), "m3") st.expectSchedule(makePod("", 8080), "m3")
@ -56,7 +56,7 @@ func TestFirstFitSchedulerFirstScheduledComplicated(t *testing.T) {
r := rand.New(rand.NewSource(0)) r := rand.New(rand.NewSource(0))
st := schedulerTester{ st := schedulerTester{
t: t, t: t,
scheduler: MakeFirstFitScheduler(fakeRegistry, r), scheduler: NewFirstFitScheduler(fakeRegistry, r),
minionLister: FakeMinionLister{"m1", "m2", "m3"}, minionLister: FakeMinionLister{"m1", "m2", "m3"},
} }
st.expectSchedule(makePod("", 8080, 8081), "m3") st.expectSchedule(makePod("", 8080, 8081), "m3")
@ -71,7 +71,7 @@ func TestFirstFitSchedulerFirstScheduledImpossible(t *testing.T) {
r := rand.New(rand.NewSource(0)) r := rand.New(rand.NewSource(0))
st := schedulerTester{ st := schedulerTester{
t: t, t: t,
scheduler: MakeFirstFitScheduler(fakeRegistry, r), scheduler: NewFirstFitScheduler(fakeRegistry, r),
minionLister: FakeMinionLister{"m1", "m2", "m3"}, minionLister: FakeMinionLister{"m1", "m2", "m3"},
} }
st.expectFailure(makePod("", 8080, 8081)) st.expectFailure(makePod("", 8080, 8081))