diff --git a/pkg/util/flowcontrol/apf_controller.go b/pkg/util/flowcontrol/apf_controller.go index b921597a1..860636e16 100644 --- a/pkg/util/flowcontrol/apf_controller.go +++ b/pkg/util/flowcontrol/apf_controller.go @@ -35,7 +35,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" apitypes "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/util/clock" utilerrors "k8s.io/apimachinery/pkg/util/errors" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" @@ -51,6 +50,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" + "k8s.io/utils/clock" flowcontrol "k8s.io/api/flowcontrol/v1beta2" flowcontrolclient "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2" diff --git a/pkg/util/flowcontrol/controller_test.go b/pkg/util/flowcontrol/controller_test.go index 715b0093c..2550666a0 100644 --- a/pkg/util/flowcontrol/controller_test.go +++ b/pkg/util/flowcontrol/controller_test.go @@ -28,7 +28,6 @@ import ( flowcontrol "k8s.io/api/flowcontrol/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" fcboot "k8s.io/apiserver/pkg/apis/flowcontrol/bootstrap" @@ -41,6 +40,7 @@ import ( clientsetfake "k8s.io/client-go/kubernetes/fake" fcclient "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2" "k8s.io/klog/v2" + "k8s.io/utils/clock" ) // Some tests print a lot of debug logs which slows down tests considerably, diff --git a/pkg/util/flowcontrol/fairqueuing/integrator.go b/pkg/util/flowcontrol/fairqueuing/integrator.go index dcba6f2c2..8499f0a74 100644 --- a/pkg/util/flowcontrol/fairqueuing/integrator.go +++ b/pkg/util/flowcontrol/fairqueuing/integrator.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apiserver/pkg/util/flowcontrol/metrics" + "k8s.io/utils/clock" ) // Integrator computes the moments of some variable X over time as diff --git a/pkg/util/flowcontrol/fairqueuing/integrator_test.go b/pkg/util/flowcontrol/fairqueuing/integrator_test.go index 3873ce574..e377ea2da 100644 --- a/pkg/util/flowcontrol/fairqueuing/integrator_test.go +++ b/pkg/util/flowcontrol/fairqueuing/integrator_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/util/clock" + testclock "k8s.io/utils/clock/testing" ) func TestIntegrator(t *testing.T) { now := time.Now() - clk := clock.NewFakeClock(now) + clk := testclock.NewFakeClock(now) igr := NewIntegrator(clk) igr.Add(3) clk.Step(time.Second) diff --git a/pkg/util/flowcontrol/metrics/metrics.go b/pkg/util/flowcontrol/metrics/metrics.go index a0d228523..cbff54856 100644 --- a/pkg/util/flowcontrol/metrics/metrics.go +++ b/pkg/util/flowcontrol/metrics/metrics.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "k8s.io/apimachinery/pkg/util/clock" compbasemetrics "k8s.io/component-base/metrics" "k8s.io/component-base/metrics/legacyregistry" basemetricstestutil "k8s.io/component-base/metrics/testutil" + "k8s.io/utils/clock" ) const ( diff --git a/pkg/util/flowcontrol/metrics/sample_and_watermark.go b/pkg/util/flowcontrol/metrics/sample_and_watermark.go index 43bd13adb..addf2fd4c 100644 --- a/pkg/util/flowcontrol/metrics/sample_and_watermark.go +++ b/pkg/util/flowcontrol/metrics/sample_and_watermark.go @@ -20,9 +20,9 @@ import ( "sync" "time" - "k8s.io/apimachinery/pkg/util/clock" compbasemetrics "k8s.io/component-base/metrics" "k8s.io/klog/v2" + "k8s.io/utils/clock" ) const ( diff --git a/pkg/util/flowcontrol/metrics/sample_and_watermark_test.go b/pkg/util/flowcontrol/metrics/sample_and_watermark_test.go index ef0795d46..cdbbfba6d 100644 --- a/pkg/util/flowcontrol/metrics/sample_and_watermark_test.go +++ b/pkg/util/flowcontrol/metrics/sample_and_watermark_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/util/clock" compbasemetrics "k8s.io/component-base/metrics" "k8s.io/component-base/metrics/legacyregistry" "k8s.io/klog/v2" + testclock "k8s.io/utils/clock/testing" ) const ( @@ -52,7 +52,7 @@ const ( */ func TestSampler(t *testing.T) { t0 := time.Now() - clk := clock.NewFakePassiveClock(t0) + clk := testclock.NewFakePassiveClock(t0) buckets := []float64{0, 1} gen := NewSampleAndWaterMarkHistogramsGenerator(clk, samplingPeriod, &compbasemetrics.HistogramOpts{Name: samplesHistName, Buckets: buckets}, diff --git a/pkg/util/flowcontrol/request/object_count_tracker.go b/pkg/util/flowcontrol/request/object_count_tracker.go index f068500f6..dd1d5e570 100644 --- a/pkg/util/flowcontrol/request/object_count_tracker.go +++ b/pkg/util/flowcontrol/request/object_count_tracker.go @@ -21,9 +21,9 @@ import ( "sync" "time" - "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/klog/v2" + "k8s.io/utils/clock" ) const ( diff --git a/pkg/util/flowcontrol/request/object_count_tracker_test.go b/pkg/util/flowcontrol/request/object_count_tracker_test.go index 0e86ce35b..06442e299 100644 --- a/pkg/util/flowcontrol/request/object_count_tracker_test.go +++ b/pkg/util/flowcontrol/request/object_count_tracker_test.go @@ -22,7 +22,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "k8s.io/apimachinery/pkg/util/clock" + testclock "k8s.io/utils/clock/testing" ) func TestStorageObjectCountTracker(t *testing.T) { @@ -66,7 +66,7 @@ func TestStorageObjectCountTracker(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - fakeClock := &clock.FakePassiveClock{} + fakeClock := &testclock.FakePassiveClock{} tracker := &objectCountTracker{ clock: fakeClock, counts: map[string]*timestampedCount{}, @@ -93,7 +93,7 @@ func TestStorageObjectCountTracker(t *testing.T) { } func TestStorageObjectCountTrackerWithPrune(t *testing.T) { - fakeClock := &clock.FakePassiveClock{} + fakeClock := &testclock.FakePassiveClock{} tracker := &objectCountTracker{ clock: fakeClock, counts: map[string]*timestampedCount{},