From 94a6975e331c6e9e26d34e31dcc27b8e2910d5d4 Mon Sep 17 00:00:00 2001 From: Seth Saperstein Date: Mon, 13 Nov 2023 18:08:59 -0800 Subject: [PATCH] fix clock per linter --- pkg/controller/flink/client/error_handler.go | 2 +- pkg/controller/flink/client/error_handler_test.go | 4 ++-- pkg/controller/flink/mock/mock_error_handler.go | 2 +- pkg/controller/flinkapplication/flink_state_machine.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/controller/flink/client/error_handler.go b/pkg/controller/flink/client/error_handler.go index 74f0f255..d1bc2bea 100644 --- a/pkg/controller/flink/client/error_handler.go +++ b/pkg/controller/flink/client/error_handler.go @@ -10,7 +10,7 @@ import ( "github.com/lyft/flinkk8soperator/pkg/apis/app/v1beta1" "github.com/pkg/errors" - "k8s.io/apimachinery/pkg/util/clock" + "k8s.io/utils/clock" ) // appError codes diff --git a/pkg/controller/flink/client/error_handler_test.go b/pkg/controller/flink/client/error_handler_test.go index fd6ee52a..c6ce51e2 100644 --- a/pkg/controller/flink/client/error_handler_test.go +++ b/pkg/controller/flink/client/error_handler_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/util/clock" + clockTesting "k8s.io/utils/clock/testing" "github.com/pkg/errors" "github.com/stretchr/testify/assert" @@ -63,7 +63,7 @@ func TestRetryHandler_IsTimeToRetry(t *testing.T) { retryer := getTestRetryer() currTime := metav1.NewTime(time.Now()) olderTime := currTime.Add(-5 * time.Second) - fakeClock := clock.NewFakeClock(currTime.Time) + fakeClock := clockTesting.NewFakeClock(currTime.Time) fakeClock.SetTime(time.Now()) // Set retry count to 0 to keep retry delay small assert.True(t, retryer.IsTimeToRetry(fakeClock, olderTime, 0)) diff --git a/pkg/controller/flink/mock/mock_error_handler.go b/pkg/controller/flink/mock/mock_error_handler.go index 8350927f..fd69ed72 100644 --- a/pkg/controller/flink/mock/mock_error_handler.go +++ b/pkg/controller/flink/mock/mock_error_handler.go @@ -3,7 +3,7 @@ package mock import ( "time" - "k8s.io/apimachinery/pkg/util/clock" + "k8s.io/utils/clock" ) type IsErrorRetryableFunc func(err error) bool diff --git a/pkg/controller/flinkapplication/flink_state_machine.go b/pkg/controller/flinkapplication/flink_state_machine.go index 92fbf412..1b935907 100644 --- a/pkg/controller/flinkapplication/flink_state_machine.go +++ b/pkg/controller/flinkapplication/flink_state_machine.go @@ -25,7 +25,7 @@ import ( "github.com/lyft/flytestdlib/promutils/labeled" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/clock" + "k8s.io/utils/clock" ) const (