From adf82f050c94f844a7f7c2b65c467a8a7f8e923b Mon Sep 17 00:00:00 2001
From: wojtekt <wojtekt@google.com>
Date: Wed, 15 Sep 2021 10:05:55 +0200
Subject: [PATCH]  Migrate to k8s.io/utils/clock in apimachinery

---
 .../src/k8s.io/apimachinery/pkg/util/cache/expiring.go    | 8 ++++----
 .../k8s.io/apimachinery/pkg/util/cache/expiring_test.go   | 6 +++---
 .../apimachinery/pkg/util/cache/lruexpirecache_test.go    | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/staging/src/k8s.io/apimachinery/pkg/util/cache/expiring.go b/staging/src/k8s.io/apimachinery/pkg/util/cache/expiring.go
index faf2c264538..0d2f153bf9e 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/cache/expiring.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/cache/expiring.go
@@ -21,17 +21,17 @@ import (
 	"sync"
 	"time"
 
-	utilclock "k8s.io/apimachinery/pkg/util/clock"
+	"k8s.io/utils/clock"
 )
 
 // NewExpiring returns an initialized expiring cache.
 func NewExpiring() *Expiring {
-	return NewExpiringWithClock(utilclock.RealClock{})
+	return NewExpiringWithClock(clock.RealClock{})
 }
 
 // NewExpiringWithClock is like NewExpiring but allows passing in a custom
 // clock for testing.
-func NewExpiringWithClock(clock utilclock.Clock) *Expiring {
+func NewExpiringWithClock(clock clock.Clock) *Expiring {
 	return &Expiring{
 		clock: clock,
 		cache: make(map[interface{}]entry),
@@ -40,7 +40,7 @@ func NewExpiringWithClock(clock utilclock.Clock) *Expiring {
 
 // Expiring is a map whose entries expire after a per-entry timeout.
 type Expiring struct {
-	clock utilclock.Clock
+	clock clock.Clock
 
 	// mu protects the below fields
 	mu sync.RWMutex
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/cache/expiring_test.go b/staging/src/k8s.io/apimachinery/pkg/util/cache/expiring_test.go
index 53f8707651a..6d45be6365a 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/cache/expiring_test.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/cache/expiring_test.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/google/uuid"
 
-	utilclock "k8s.io/apimachinery/pkg/util/clock"
+	testingclock "k8s.io/utils/clock/testing"
 )
 
 func TestExpiringCache(t *testing.T) {
@@ -58,7 +58,7 @@ func TestExpiringCache(t *testing.T) {
 }
 
 func TestExpiration(t *testing.T) {
-	fc := &utilclock.FakeClock{}
+	fc := &testingclock.FakeClock{}
 	c := NewExpiringWithClock(fc)
 
 	c.Set("a", "a", time.Second)
@@ -104,7 +104,7 @@ func TestExpiration(t *testing.T) {
 }
 
 func TestGarbageCollection(t *testing.T) {
-	fc := &utilclock.FakeClock{}
+	fc := &testingclock.FakeClock{}
 
 	type entry struct {
 		key, val string
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/cache/lruexpirecache_test.go b/staging/src/k8s.io/apimachinery/pkg/util/cache/lruexpirecache_test.go
index bfafe87b13f..f1de853efe1 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/cache/lruexpirecache_test.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/cache/lruexpirecache_test.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"k8s.io/apimachinery/pkg/util/clock"
+	testingclock "k8s.io/utils/clock/testing"
 )
 
 func expectEntry(t *testing.T, c *LRUExpireCache, key interface{}, value interface{}) {
@@ -68,7 +68,7 @@ func TestSimpleRemove(t *testing.T) {
 }
 
 func TestExpiredGet(t *testing.T) {
-	fakeClock := clock.NewFakeClock(time.Now())
+	fakeClock := testingclock.NewFakeClock(time.Now())
 	c := NewLRUExpireCacheWithClock(10, fakeClock)
 	c.Add("short-lived", "12345", 1*time.Millisecond)
 	// ensure the entry expired