diff --git a/pkg/controlplane/instance.go b/pkg/controlplane/instance.go index 944e7db79fd..f9ba8ff2028 100644 --- a/pkg/controlplane/instance.go +++ b/pkg/controlplane/instance.go @@ -55,7 +55,6 @@ import ( storageapiv1alpha1 "k8s.io/api/storage/v1alpha1" storageapiv1beta1 "k8s.io/api/storage/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/clock" utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" @@ -83,6 +82,7 @@ import ( "k8s.io/kubernetes/pkg/routes" "k8s.io/kubernetes/pkg/serviceaccount" nodeutil "k8s.io/kubernetes/pkg/util/node" + "k8s.io/utils/clock" // RESTStorage installers admissionregistrationrest "k8s.io/kubernetes/pkg/registry/admissionregistration/rest" diff --git a/staging/src/k8s.io/component-helpers/apimachinery/lease/controller.go b/staging/src/k8s.io/component-helpers/apimachinery/lease/controller.go index 517351a3b4d..3916bb1d7af 100644 --- a/staging/src/k8s.io/component-helpers/apimachinery/lease/controller.go +++ b/staging/src/k8s.io/component-helpers/apimachinery/lease/controller.go @@ -24,10 +24,10 @@ import ( coordinationv1 "k8s.io/api/coordination/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" coordclientset "k8s.io/client-go/kubernetes/typed/coordination/v1" + "k8s.io/utils/clock" "k8s.io/utils/pointer" "k8s.io/klog/v2" diff --git a/staging/src/k8s.io/component-helpers/apimachinery/lease/controller_test.go b/staging/src/k8s.io/component-helpers/apimachinery/lease/controller_test.go index 939f96095ac..ce0c71edd2c 100644 --- a/staging/src/k8s.io/component-helpers/apimachinery/lease/controller_test.go +++ b/staging/src/k8s.io/component-helpers/apimachinery/lease/controller_test.go @@ -31,18 +31,18 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/diff" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" + testingclock "k8s.io/utils/clock/testing" "k8s.io/utils/pointer" "k8s.io/klog/v2" ) func TestNewNodeLease(t *testing.T) { - fakeClock := clock.NewFakeClock(time.Now()) + fakeClock := testingclock.NewFakeClock(time.Now()) node := &corev1.Node{ ObjectMeta: metav1.ObjectMeta{ Name: "foo", @@ -276,7 +276,7 @@ func TestRetryUpdateNodeLease(t *testing.T) { cl.PrependReactor("get", "leases", tc.getReactor) } c := &controller{ - clock: clock.NewFakeClock(time.Now()), + clock: testingclock.NewFakeClock(time.Now()), client: cl, leaseClient: cl.CoordinationV1().Leases(corev1.NamespaceNodeLease), holderIdentity: node.Name, @@ -414,7 +414,7 @@ func TestUpdateUsingLatestLease(t *testing.T) { cl.PrependReactor("create", "leases", tc.createReactor) } c := &controller{ - clock: clock.NewFakeClock(time.Now()), + clock: testingclock.NewFakeClock(time.Now()), client: cl, leaseClient: cl.CoordinationV1().Leases(corev1.NamespaceNodeLease), holderIdentity: node.Name,