github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #105375 from jonyhy96/fix-clock-util

Browse Source 
node: test file use k8s.io/utils/clock instead
This commit is contained in:
Kubernetes Prow Robot 2021-10-04 04:19:31 -07:00 committed by GitHub
commit c724abae81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/controller/nodelifecycle/scheduler/timed_workers.go
View File

@ -22,8 +22,7 @@ import (
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/klog/v2" "k8s.io/klog/v2"
// TODO: Switch to k8s.io/utils/clock once it supports AfterFunc() "k8s.io/utils/clock"
"k8s.io/apimachinery/pkg/util/clock"
) )
// WorkArgs keeps arguments that will be passed to the function executed by the worker. // WorkArgs keeps arguments that will be passed to the function executed by the worker.
@ -50,7 +49,7 @@ type TimedWorker struct {
} }
// createWorker creates a TimedWorker that will execute `f` not earlier than `fireAt`. // createWorker creates a TimedWorker that will execute `f` not earlier than `fireAt`.
func createWorker(args *WorkArgs, createdAt time.Time, fireAt time.Time, f func(args *WorkArgs) error, clock clock.Clock) *TimedWorker { func createWorker(args *WorkArgs, createdAt time.Time, fireAt time.Time, f func(args *WorkArgs) error, clock clock.WithDelayedExecution) *TimedWorker {
delay := fireAt.Sub(createdAt) delay := fireAt.Sub(createdAt)
if delay <= 0 { if delay <= 0 {
go f(args) go f(args)
@ -78,7 +77,7 @@ type TimedWorkerQueue struct {
// map of workers keyed by string returned by 'KeyFromWorkArgs' from the given worker. // map of workers keyed by string returned by 'KeyFromWorkArgs' from the given worker.
workers map[string]*TimedWorker workers map[string]*TimedWorker
workFunc func(args *WorkArgs) error workFunc func(args *WorkArgs) error
clock clock.Clock clock clock.WithDelayedExecution
} }
// CreateWorkerQueue creates a new TimedWorkerQueue for workers that will execute // CreateWorkerQueue creates a new TimedWorkerQueue for workers that will execute

8
pkg/controller/nodelifecycle/scheduler/timed_workers_test.go
View File

@ -22,7 +22,7 @@ import (
"testing" "testing"
"time" "time"
"k8s.io/apimachinery/pkg/util/clock" testingclock "k8s.io/utils/clock/testing"
) )
func TestExecute(t *testing.T) { func TestExecute(t *testing.T) {
@ -64,7 +64,7 @@ func TestExecuteDelayed(t *testing.T) {
}) })
now := time.Now() now := time.Now()
then := now.Add(10 * time.Second) then := now.Add(10 * time.Second)
fakeClock := clock.NewFakeClock(now) fakeClock := testingclock.NewFakeClock(now)
queue.clock = fakeClock queue.clock = fakeClock
queue.AddWork(NewWorkArgs("1", "1"), now, then) queue.AddWork(NewWorkArgs("1", "1"), now, then)
queue.AddWork(NewWorkArgs("2", "2"), now, then) queue.AddWork(NewWorkArgs("2", "2"), now, then)
@ -95,7 +95,7 @@ func TestCancel(t *testing.T) {
}) })
now := time.Now() now := time.Now()
then := now.Add(10 * time.Second) then := now.Add(10 * time.Second)
fakeClock := clock.NewFakeClock(now) fakeClock := testingclock.NewFakeClock(now)
queue.clock = fakeClock queue.clock = fakeClock
queue.AddWork(NewWorkArgs("1", "1"), now, then) queue.AddWork(NewWorkArgs("1", "1"), now, then)
queue.AddWork(NewWorkArgs("2", "2"), now, then) queue.AddWork(NewWorkArgs("2", "2"), now, then)
@ -128,7 +128,7 @@ func TestCancelAndReadd(t *testing.T) {
}) })
now := time.Now() now := time.Now()
then := now.Add(10 * time.Second) then := now.Add(10 * time.Second)
fakeClock := clock.NewFakeClock(now) fakeClock := testingclock.NewFakeClock(now)
queue.clock = fakeClock queue.clock = fakeClock
queue.AddWork(NewWorkArgs("1", "1"), now, then) queue.AddWork(NewWorkArgs("1", "1"), now, then)
queue.AddWork(NewWorkArgs("2", "2"), now, then) queue.AddWork(NewWorkArgs("2", "2"), now, then)

1
vendor/modules.txt vendored
View File

@ -1398,7 +1398,6 @@ k8s.io/apimachinery/pkg/runtime/serializer/yaml
k8s.io/apimachinery/pkg/selection k8s.io/apimachinery/pkg/selection
k8s.io/apimachinery/pkg/types k8s.io/apimachinery/pkg/types
k8s.io/apimachinery/pkg/util/cache k8s.io/apimachinery/pkg/util/cache
k8s.io/apimachinery/pkg/util/clock
k8s.io/apimachinery/pkg/util/diff k8s.io/apimachinery/pkg/util/diff
k8s.io/apimachinery/pkg/util/duration k8s.io/apimachinery/pkg/util/duration
k8s.io/apimachinery/pkg/util/errors k8s.io/apimachinery/pkg/util/errors