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

Migrate to k8s.io/utils/clock in client-go - part 1

Browse Source
This commit is contained in:
wojtekt 2021-09-15 10:58:56 +02:00
parent adf82f050c
commit 950f655bdd
9 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go
View File

@ -38,7 +38,6 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/util/clock"
"k8s.io/client-go/pkg/apis/clientauthentication" "k8s.io/client-go/pkg/apis/clientauthentication"
"k8s.io/client-go/pkg/apis/clientauthentication/install" "k8s.io/client-go/pkg/apis/clientauthentication/install"
clientauthenticationv1 "k8s.io/client-go/pkg/apis/clientauthentication/v1" clientauthenticationv1 "k8s.io/client-go/pkg/apis/clientauthentication/v1"
@ -49,6 +48,7 @@ import (
"k8s.io/client-go/transport" "k8s.io/client-go/transport"
"k8s.io/client-go/util/connrotation" "k8s.io/client-go/util/connrotation"
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/utils/clock"
) )
const execInfoEnv = "KUBERNETES_EXEC_INFO" const execInfoEnv = "KUBERNETES_EXEC_INFO"

4
staging/src/k8s.io/client-go/plugin/pkg/client/auth/exec/exec_test.go
View File

@ -39,10 +39,10 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/clock"
"k8s.io/client-go/pkg/apis/clientauthentication" "k8s.io/client-go/pkg/apis/clientauthentication"
"k8s.io/client-go/tools/clientcmd/api" "k8s.io/client-go/tools/clientcmd/api"
"k8s.io/client-go/transport" "k8s.io/client-go/transport"
testingclock "k8s.io/utils/clock/testing"
) )
var ( var (
@ -1421,7 +1421,7 @@ func TestInstallHintRateLimit(t *testing.T) {
a.sometimes.threshold = test.threshold a.sometimes.threshold = test.threshold
a.sometimes.interval = test.interval a.sometimes.interval = test.interval
clock := clock.NewFakeClock(time.Now()) clock := testingclock.NewFakeClock(time.Now())
a.sometimes.clock = clock a.sometimes.clock = clock
count := 0 count := 0

6
staging/src/k8s.io/client-go/rest/request.go
View File

@ -39,13 +39,13 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer/streaming" "k8s.io/apimachinery/pkg/runtime/serializer/streaming"
utilclock "k8s.io/apimachinery/pkg/util/clock"
"k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
restclientwatch "k8s.io/client-go/rest/watch" restclientwatch "k8s.io/client-go/rest/watch"
"k8s.io/client-go/tools/metrics" "k8s.io/client-go/tools/metrics"
"k8s.io/client-go/util/flowcontrol" "k8s.io/client-go/util/flowcontrol"
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/utils/clock"
) )
var ( var (
@ -619,12 +619,12 @@ type throttleSettings struct {
} }
type throttledLogger struct { type throttledLogger struct {
clock utilclock.PassiveClock clock clock.PassiveClock
settings []*throttleSettings settings []*throttleSettings
} }
var globalThrottledLogger = &throttledLogger{ var globalThrottledLogger = &throttledLogger{
clock: utilclock.RealClock{}, clock: clock.RealClock{},
settings: []*throttleSettings{ settings: []*throttleSettings{
{ {
logLevel: 2, logLevel: 2,

3
staging/src/k8s.io/client-go/rest/request_test.go
View File

@ -45,7 +45,6 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer/streaming" "k8s.io/apimachinery/pkg/runtime/serializer/streaming"
"k8s.io/apimachinery/pkg/util/clock"
"k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/diff"
"k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/apimachinery/pkg/util/httpstream"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
@ -2485,7 +2484,7 @@ func TestThrottledLogger(t *testing.T) {
defer func() { defer func() {
globalThrottledLogger.clock = oldClock globalThrottledLogger.clock = oldClock
}() }()
clock := clock.NewFakeClock(now) clock := testingclock.NewFakeClock(now)
globalThrottledLogger.clock = clock globalThrottledLogger.clock = clock
logMessages := 0 logMessages := 0

2
staging/src/k8s.io/client-go/tools/events/event_broadcaster.go
View File

@ -29,7 +29,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/clock"
"k8s.io/apimachinery/pkg/util/json" "k8s.io/apimachinery/pkg/util/json"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/apimachinery/pkg/util/strategicpatch"
@ -43,6 +42,7 @@ import (
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
"k8s.io/client-go/tools/record/util" "k8s.io/client-go/tools/record/util"
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/utils/clock"
) )
const ( const (

2
staging/src/k8s.io/client-go/tools/events/event_recorder.go
View File

@ -24,12 +24,12 @@ import (
eventsv1 "k8s.io/api/events/v1" eventsv1 "k8s.io/api/events/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/clock"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/tools/record/util" "k8s.io/client-go/tools/record/util"
"k8s.io/client-go/tools/reference" "k8s.io/client-go/tools/reference"
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/utils/clock"
) )
type recorderImpl struct { type recorderImpl struct {

10
staging/src/k8s.io/client-go/tools/leaderelection/healthzadaptor_test.go
View File

@ -24,8 +24,8 @@ import (
"net/http" "net/http"
"k8s.io/apimachinery/pkg/util/clock"
rl "k8s.io/client-go/tools/leaderelection/resourcelock" rl "k8s.io/client-go/tools/leaderelection/resourcelock"
testingclock "k8s.io/utils/clock/testing"
) )
type fakeLock struct { type fakeLock struct {
@ -91,7 +91,7 @@ func TestLeaderElectionHealthChecker(t *testing.T) {
HolderIdentity: "healthTest", HolderIdentity: "healthTest",
}, },
observedTime: current, observedTime: current,
clock: clock.NewFakeClock(current.Add(time.Hour)), clock: testingclock.NewFakeClock(current.Add(time.Hour)),
}, },
}, },
{ {
@ -108,7 +108,7 @@ func TestLeaderElectionHealthChecker(t *testing.T) {
HolderIdentity: "otherServer", HolderIdentity: "otherServer",
}, },
observedTime: current, observedTime: current,
clock: clock.NewFakeClock(current.Add(time.Hour)), clock: testingclock.NewFakeClock(current.Add(time.Hour)),
}, },
}, },
{ {
@ -125,7 +125,7 @@ func TestLeaderElectionHealthChecker(t *testing.T) {
HolderIdentity: "healthTest", HolderIdentity: "healthTest",
}, },
observedTime: current, observedTime: current,
clock: clock.NewFakeClock(current), clock: testingclock.NewFakeClock(current),
}, },
}, },
{ {
@ -142,7 +142,7 @@ func TestLeaderElectionHealthChecker(t *testing.T) {
HolderIdentity: "healthTest", HolderIdentity: "healthTest",
}, },
observedTime: current, observedTime: current,
clock: clock.NewFakeClock(current.Add(time.Minute).Add(time.Second)), clock: testingclock.NewFakeClock(current.Add(time.Minute).Add(time.Second)),
}, },
}, },
} }

2
staging/src/k8s.io/client-go/tools/leaderelection/leaderelection.go
View File

@ -61,10 +61,10 @@ import (
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/clock"
"k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
rl "k8s.io/client-go/tools/leaderelection/resourcelock" rl "k8s.io/client-go/tools/leaderelection/resourcelock"
"k8s.io/utils/clock"
"k8s.io/klog/v2" "k8s.io/klog/v2"
) )

2
staging/src/k8s.io/client-go/tools/leaderelection/leaderelection_test.go
View File

@ -30,12 +30,12 @@ import (
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/clock"
"k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/diff"
"k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/fake"
fakeclient "k8s.io/client-go/testing" fakeclient "k8s.io/client-go/testing"
rl "k8s.io/client-go/tools/leaderelection/resourcelock" rl "k8s.io/client-go/tools/leaderelection/resourcelock"
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
"k8s.io/utils/clock"
) )
func createLockObject(t *testing.T, objectType, namespace, name string, record *rl.LeaderElectionRecord) (obj runtime.Object) { func createLockObject(t *testing.T, objectType, namespace, name string, record *rl.LeaderElectionRecord) (obj runtime.Object) {