mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 22:46:12 +00:00
Shorten component constructor names
This commit is contained in:
parent
e04bfd0a3e
commit
7adfabecda
@ -41,7 +41,7 @@ type schedulerAlgorithm struct {
|
|||||||
podScheduler podschedulers.PodScheduler
|
podScheduler podschedulers.PodScheduler
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewSchedulerAlgorithm(sched scheduler.Scheduler, podUpdates queue.FIFO, podScheduler podschedulers.PodScheduler) SchedulerAlgorithm {
|
func New(sched scheduler.Scheduler, podUpdates queue.FIFO, podScheduler podschedulers.PodScheduler) SchedulerAlgorithm {
|
||||||
return &schedulerAlgorithm{
|
return &schedulerAlgorithm{
|
||||||
sched: sched,
|
sched: sched,
|
||||||
podUpdates: podUpdates,
|
podUpdates: podUpdates,
|
||||||
|
@ -36,7 +36,7 @@ type binder struct {
|
|||||||
sched scheduler.Scheduler
|
sched scheduler.Scheduler
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewBinder(sched scheduler.Scheduler) Binder {
|
func New(sched scheduler.Scheduler) Binder {
|
||||||
return &binder{
|
return &binder{
|
||||||
sched: sched,
|
sched: sched,
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,7 @@ type deleter struct {
|
|||||||
qr *queuer.Queuer
|
qr *queuer.Queuer
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewDeleter(sched scheduler.Scheduler, qr *queuer.Queuer) Deleter {
|
func New(sched scheduler.Scheduler, qr *queuer.Queuer) Deleter {
|
||||||
return &deleter{
|
return &deleter{
|
||||||
sched: sched,
|
sched: sched,
|
||||||
qr: qr,
|
qr: qr,
|
||||||
|
@ -36,7 +36,7 @@ func TestDeleteOne_NonexistentPod(t *testing.T) {
|
|||||||
|
|
||||||
qr := queuer.New(nil)
|
qr := queuer.New(nil)
|
||||||
assert.Equal(0, len(qr.PodQueue.List()))
|
assert.Equal(0, len(qr.PodQueue.List()))
|
||||||
d := NewDeleter(obj, qr)
|
d := New(obj, qr)
|
||||||
pod := &queuer.Pod{Pod: &api.Pod{
|
pod := &queuer.Pod{Pod: &api.Pod{
|
||||||
ObjectMeta: api.ObjectMeta{
|
ObjectMeta: api.ObjectMeta{
|
||||||
Name: "foo",
|
Name: "foo",
|
||||||
@ -72,7 +72,7 @@ func TestDeleteOne_PendingPod(t *testing.T) {
|
|||||||
assert.True(found)
|
assert.True(found)
|
||||||
|
|
||||||
// exec & post conditions
|
// exec & post conditions
|
||||||
d := NewDeleter(obj, qr)
|
d := New(obj, qr)
|
||||||
err = d.DeleteOne(pod)
|
err = d.DeleteOne(pod)
|
||||||
assert.Nil(err)
|
assert.Nil(err)
|
||||||
_, found = qr.PodQueue.Get("foo0")
|
_, found = qr.PodQueue.Get("foo0")
|
||||||
@ -114,7 +114,7 @@ func TestDeleteOne_Running(t *testing.T) {
|
|||||||
obj.On("KillTask", task.ID).Return(nil)
|
obj.On("KillTask", task.ID).Return(nil)
|
||||||
|
|
||||||
// exec & post conditions
|
// exec & post conditions
|
||||||
d := NewDeleter(obj, qr)
|
d := New(obj, qr)
|
||||||
err = d.DeleteOne(pod)
|
err = d.DeleteOne(pod)
|
||||||
assert.Nil(err)
|
assert.Nil(err)
|
||||||
_, found = qr.PodQueue.Get("foo0")
|
_, found = qr.PodQueue.Get("foo0")
|
||||||
@ -127,7 +127,7 @@ func TestDeleteOne_badPodNaming(t *testing.T) {
|
|||||||
assert := assert.New(t)
|
assert := assert.New(t)
|
||||||
obj := &types.MockScheduler{}
|
obj := &types.MockScheduler{}
|
||||||
pod := &queuer.Pod{Pod: &api.Pod{}}
|
pod := &queuer.Pod{Pod: &api.Pod{}}
|
||||||
d := NewDeleter(obj, queuer.New(nil))
|
d := New(obj, queuer.New(nil))
|
||||||
|
|
||||||
err := d.DeleteOne(pod)
|
err := d.DeleteOne(pod)
|
||||||
assert.NotNil(err)
|
assert.NotNil(err)
|
||||||
|
@ -41,7 +41,7 @@ type errorHandler struct {
|
|||||||
podScheduler podschedulers.PodScheduler
|
podScheduler podschedulers.PodScheduler
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewErrorHandler(sched scheduler.Scheduler, backoff *backoff.Backoff, qr *queuer.Queuer, podScheduler podschedulers.PodScheduler) ErrorHandler {
|
func New(sched scheduler.Scheduler, backoff *backoff.Backoff, qr *queuer.Queuer, podScheduler podschedulers.PodScheduler) ErrorHandler {
|
||||||
return &errorHandler{
|
return &errorHandler{
|
||||||
sched: sched,
|
sched: sched,
|
||||||
backoff: backoff,
|
backoff: backoff,
|
||||||
|
@ -284,7 +284,7 @@ func (k *framework) onInitialRegistration(driver bindings.SchedulerDriver) {
|
|||||||
r1 := k.makeTaskRegistryReconciler()
|
r1 := k.makeTaskRegistryReconciler()
|
||||||
r2 := k.makePodRegistryReconciler()
|
r2 := k.makePodRegistryReconciler()
|
||||||
|
|
||||||
k.tasksReconciler = taskreconciler.NewTasksReconciler(k.asRegisteredMaster, k.makeCompositeReconciler(r1, r2),
|
k.tasksReconciler = taskreconciler.New(k.asRegisteredMaster, k.makeCompositeReconciler(r1, r2),
|
||||||
k.reconcileCooldown, k.schedulerConfig.ExplicitReconciliationAbortTimeout.Duration, k.terminate)
|
k.reconcileCooldown, k.schedulerConfig.ExplicitReconciliationAbortTimeout.Duration, k.terminate)
|
||||||
go k.tasksReconciler.Run(driver, k.terminate)
|
go k.tasksReconciler.Run(driver, k.terminate)
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ type podReconciler struct {
|
|||||||
deleter deleter.Deleter
|
deleter deleter.Deleter
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewPodReconciler(sched scheduler.Scheduler, client *client.Client, qr *queuer.Queuer, deleter deleter.Deleter) PodReconciler {
|
func New(sched scheduler.Scheduler, client *client.Client, qr *queuer.Queuer, deleter deleter.Deleter) PodReconciler {
|
||||||
return &podReconciler{
|
return &podReconciler{
|
||||||
sched: sched,
|
sched: sched,
|
||||||
client: client,
|
client: client,
|
||||||
|
@ -68,16 +68,16 @@ func NewScheduler(c *config.Config, fw framework.Framework, ps podschedulers.Pod
|
|||||||
|
|
||||||
q := queuer.New(podUpdates)
|
q := queuer.New(podUpdates)
|
||||||
|
|
||||||
algorithm := algorithm.NewSchedulerAlgorithm(core, podUpdates, ps)
|
algorithm := algorithm.New(core, podUpdates, ps)
|
||||||
|
|
||||||
podDeleter := deleter.NewDeleter(core, q)
|
podDeleter := deleter.New(core, q)
|
||||||
|
|
||||||
core.podReconciler = podreconciler.NewPodReconciler(core, client, q, podDeleter)
|
core.podReconciler = podreconciler.New(core, client, q, podDeleter)
|
||||||
|
|
||||||
bo := backoff.New(c.InitialPodBackoff.Duration, c.MaxPodBackoff.Duration)
|
bo := backoff.New(c.InitialPodBackoff.Duration, c.MaxPodBackoff.Duration)
|
||||||
errorHandler := errorhandler.NewErrorHandler(core, bo, q, ps)
|
errorHandler := errorhandler.New(core, bo, q, ps)
|
||||||
|
|
||||||
binder := binder.NewBinder(core)
|
binder := binder.New(core)
|
||||||
|
|
||||||
startLatch := make(chan struct{})
|
startLatch := make(chan struct{})
|
||||||
|
|
||||||
@ -90,7 +90,7 @@ func NewScheduler(c *config.Config, fw framework.Framework, ps podschedulers.Pod
|
|||||||
podtask.InstallDebugHandlers(core.Tasks(), mux)
|
podtask.InstallDebugHandlers(core.Tasks(), mux)
|
||||||
})
|
})
|
||||||
|
|
||||||
core.loop = schedulerloop.NewSchedulerLoop(client, algorithm, recorder, q.Yield, errorHandler.Error, binder, startLatch)
|
core.loop = schedulerloop.New(client, algorithm, recorder, q.Yield, errorHandler.Error, binder, startLatch)
|
||||||
return core
|
return core
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ type schedulerLoop struct {
|
|||||||
started chan<- struct{} // startup latch
|
started chan<- struct{} // startup latch
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewSchedulerLoop(client *client.Client, algorithm algorithm.SchedulerAlgorithm,
|
func New(client *client.Client, algorithm algorithm.SchedulerAlgorithm,
|
||||||
recorder record.EventRecorder, nextPod func() *api.Pod, error func(pod *api.Pod, schedulingErr error),
|
recorder record.EventRecorder, nextPod func() *api.Pod, error func(pod *api.Pod, schedulingErr error),
|
||||||
binder binder.Binder, started chan<- struct{}) SchedulerLoop {
|
binder binder.Binder, started chan<- struct{}) SchedulerLoop {
|
||||||
return &schedulerLoop{
|
return &schedulerLoop{
|
||||||
|
@ -44,7 +44,7 @@ type tasksReconciler struct {
|
|||||||
explicitReconciliationAbortTimeout time.Duration
|
explicitReconciliationAbortTimeout time.Duration
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewTasksReconciler(doer proc.Doer, action ReconcilerAction,
|
func New(doer proc.Doer, action ReconcilerAction,
|
||||||
cooldown, explicitReconciliationAbortTimeout time.Duration, done <-chan struct{}) TasksReconciler {
|
cooldown, explicitReconciliationAbortTimeout time.Duration, done <-chan struct{}) TasksReconciler {
|
||||||
return &tasksReconciler{
|
return &tasksReconciler{
|
||||||
Doer: doer,
|
Doer: doer,
|
||||||
|
Loading…
Reference in New Issue
Block a user