Merge pull request #110776 from harry1064/remove-clock-pkg-scheduler

Use clock package from k8s.io/utils/clock
kubernetes · Jun 25, 2022 · d2c5779 · d2c5779
2 parents 11686e1 + fceb5cd
commit d2c5779
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 39 deletions.
diff --git a/pkg/scheduler/internal/queue/scheduling_queue.go b/pkg/scheduler/internal/queue/scheduling_queue.go
@@ -46,6 +46,7 @@ import (
 	"k8s.io/kubernetes/pkg/scheduler/internal/heap"
 	"k8s.io/kubernetes/pkg/scheduler/metrics"
 	"k8s.io/kubernetes/pkg/scheduler/util"
+	"k8s.io/utils/clock"
 )
 
 const (
@@ -136,7 +137,7 @@ type PriorityQueue struct {
 	framework.PodNominator
 
 	stop  chan struct{}
-	clock util.Clock
+	clock clock.Clock
 
 	// pod initial backoff duration.
 	podInitialBackoffDuration time.Duration
@@ -175,7 +176,7 @@ type PriorityQueue struct {
 }
 
 type priorityQueueOptions struct {
-	clock                             util.Clock
+	clock                             clock.Clock
 	podInitialBackoffDuration         time.Duration
 	podMaxBackoffDuration             time.Duration
 	podMaxInUnschedulablePodsDuration time.Duration
@@ -186,8 +187,8 @@ type priorityQueueOptions struct {
 // Option configures a PriorityQueue
 type Option func(*priorityQueueOptions)
 
-// WithClock sets clock for PriorityQueue, the default clock is util.RealClock.
-func WithClock(clock util.Clock) Option {
+// WithClock sets clock for PriorityQueue, the default clock is clock.RealClock.
+func WithClock(clock clock.Clock) Option {
 	return func(o *priorityQueueOptions) {
 		o.clock = clock
 	}
@@ -229,7 +230,7 @@ func WithPodMaxInUnschedulablePodsDuration(duration time.Duration) Option {
 }
 
 var defaultPriorityQueueOptions = priorityQueueOptions{
-	clock:                             util.RealClock{},
+	clock:                             clock.RealClock{},
 	podInitialBackoffDuration:         DefaultPodInitialBackoffDuration,
 	podMaxBackoffDuration:             DefaultPodMaxBackoffDuration,
 	podMaxInUnschedulablePodsDuration: DefaultPodMaxInUnschedulablePodsDuration,

diff --git a/pkg/scheduler/util/clock.go b/pkg/scheduler/util/clock.go