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

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

Browse Source 
Use clock package from k8s.io/utils/clock
This commit is contained in:
Kubernetes Prow Robot 2022-06-24 22:32:57 -07:00 committed by GitHub
commit d2c5779dad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/scheduler/internal/queue/scheduling_queue.go
View File

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

34
pkg/scheduler/util/clock.go
View File

@ -1,34 +0,0 @@
/*
Copyright 2018 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package util
import (
"time"
)
// Clock provides an interface for getting the current time
type Clock interface {
Now() time.Time
}
// RealClock implements a clock using time
type RealClock struct{}
// Now returns the current time with time.Now
func (RealClock) Now() time.Time {
return time.Now()
}