diff --git a/pkg/cloudprovider/aws/suite_test.go b/pkg/cloudprovider/aws/suite_test.go index 797a800bd0d1..507cd09f7beb 100644 --- a/pkg/cloudprovider/aws/suite_test.go +++ b/pkg/cloudprovider/aws/suite_test.go @@ -26,9 +26,9 @@ import ( "github.com/patrickmn/go-cache" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "k8s.io/apimachinery/pkg/util/clock" "k8s.io/client-go/kubernetes" corev1 "k8s.io/client-go/kubernetes/typed/core/v1" + clock "k8s.io/utils/clock/testing" "knative.dev/pkg/ptr" . "github.com/onsi/ginkgo/v2" diff --git a/pkg/controllers/consolidation/controller.go b/pkg/controllers/consolidation/controller.go index dba758e735e3..a427a991d378 100644 --- a/pkg/controllers/consolidation/controller.go +++ b/pkg/controllers/consolidation/controller.go @@ -29,7 +29,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/util/clock" + "k8s.io/utils/clock" "knative.dev/pkg/logging" "knative.dev/pkg/ptr" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/controllers/consolidation/suite_test.go b/pkg/controllers/consolidation/suite_test.go index e728be48d188..439b68f0a239 100644 --- a/pkg/controllers/consolidation/suite_test.go +++ b/pkg/controllers/consolidation/suite_test.go @@ -31,10 +31,10 @@ import ( policyv1 "k8s.io/api/policy/v1beta1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/kubernetes" + clock "k8s.io/utils/clock/testing" . "knative.dev/pkg/logging/testing" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/controllers/metrics/state/suite_test.go b/pkg/controllers/metrics/state/suite_test.go index 92a7c5b9bdb9..b776e5a941c9 100644 --- a/pkg/controllers/metrics/state/suite_test.go +++ b/pkg/controllers/metrics/state/suite_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/util/clock" + clock "k8s.io/utils/clock/testing" io_prometheus_client "github.com/prometheus/client_model/go" v1 "k8s.io/api/core/v1" diff --git a/pkg/controllers/node/controller.go b/pkg/controllers/node/controller.go index 52dd90acd540..6260acbc23c6 100644 --- a/pkg/controllers/node/controller.go +++ b/pkg/controllers/node/controller.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/util/clock" + "k8s.io/utils/clock" "knative.dev/pkg/logging" controllerruntime "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/controllers/node/emptiness.go b/pkg/controllers/node/emptiness.go index 9c8ff9cb2374..160502035352 100644 --- a/pkg/controllers/node/emptiness.go +++ b/pkg/controllers/node/emptiness.go @@ -19,7 +19,7 @@ import ( "fmt" "time" - "k8s.io/apimachinery/pkg/util/clock" + "k8s.io/utils/clock" v1 "k8s.io/api/core/v1" "knative.dev/pkg/logging" diff --git a/pkg/controllers/node/expiration.go b/pkg/controllers/node/expiration.go index 2f98acfb7779..9f33bf0abac1 100644 --- a/pkg/controllers/node/expiration.go +++ b/pkg/controllers/node/expiration.go @@ -19,7 +19,7 @@ import ( "fmt" "time" - "k8s.io/apimachinery/pkg/util/clock" + "k8s.io/utils/clock" v1 "k8s.io/api/core/v1" "knative.dev/pkg/logging" diff --git a/pkg/controllers/node/suite_test.go b/pkg/controllers/node/suite_test.go index 18feefe42981..ab9e65c9fd62 100644 --- a/pkg/controllers/node/suite_test.go +++ b/pkg/controllers/node/suite_test.go @@ -21,7 +21,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/clock" + clock "k8s.io/utils/clock/testing" "knative.dev/pkg/ptr" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" diff --git a/pkg/controllers/provisioning/scheduling/suite_test.go b/pkg/controllers/provisioning/scheduling/suite_test.go index 1fb85d369f27..2eb913a92566 100644 --- a/pkg/controllers/provisioning/scheduling/suite_test.go +++ b/pkg/controllers/provisioning/scheduling/suite_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/util/clock" + clock "k8s.io/utils/clock/testing" "github.com/aws/karpenter/pkg/controllers/state" diff --git a/pkg/controllers/provisioning/suite_test.go b/pkg/controllers/provisioning/suite_test.go index 5c48467fa737..90081fd7006b 100644 --- a/pkg/controllers/provisioning/suite_test.go +++ b/pkg/controllers/provisioning/suite_test.go @@ -26,8 +26,8 @@ import ( storagev1 "k8s.io/api/storage/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/clock" corev1 "k8s.io/client-go/kubernetes/typed/core/v1" + clock "k8s.io/utils/clock/testing" "github.com/aws/karpenter/pkg/controllers/state" diff --git a/pkg/controllers/state/cluster.go b/pkg/controllers/state/cluster.go index 5aefc3d72c7a..0ffd541fbbad 100644 --- a/pkg/controllers/state/cluster.go +++ b/pkg/controllers/state/cluster.go @@ -30,8 +30,8 @@ import ( storagev1 "k8s.io/api/storage/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/sets" + "k8s.io/utils/clock" "knative.dev/pkg/ptr" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/controllers/state/suite_test.go b/pkg/controllers/state/suite_test.go index cf16f00300ef..d4940497a5d7 100644 --- a/pkg/controllers/state/suite_test.go +++ b/pkg/controllers/state/suite_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/util/clock" + clock "k8s.io/utils/clock/testing" "knative.dev/pkg/ptr" "github.com/aws/karpenter/pkg/apis/provisioning/v1alpha5" diff --git a/pkg/controllers/termination/controller.go b/pkg/controllers/termination/controller.go index fa96c45d8cd7..f9f6d357cc04 100644 --- a/pkg/controllers/termination/controller.go +++ b/pkg/controllers/termination/controller.go @@ -19,7 +19,7 @@ import ( "fmt" "time" - "k8s.io/apimachinery/pkg/util/clock" + "k8s.io/utils/clock" "golang.org/x/time/rate" "knative.dev/pkg/logging" diff --git a/pkg/controllers/termination/suite_test.go b/pkg/controllers/termination/suite_test.go index 4616f2b6eb93..beec62c8a280 100644 --- a/pkg/controllers/termination/suite_test.go +++ b/pkg/controllers/termination/suite_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/util/clock" + clock "k8s.io/utils/clock/testing" "github.com/samber/lo" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/controllers/termination/terminate.go b/pkg/controllers/termination/terminate.go index 6c9666e365fc..43ec6bcb9ac0 100644 --- a/pkg/controllers/termination/terminate.go +++ b/pkg/controllers/termination/terminate.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "k8s.io/apimachinery/pkg/util/clock" + "k8s.io/utils/clock" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors"