From a5551eb2365c7b68eac45dd2a0abb80353595703 Mon Sep 17 00:00:00 2001 From: Amanuel Engeda Date: Mon, 27 Nov 2023 15:56:22 -0800 Subject: [PATCH] Update aws/karpenter-core to sigs.k8s.io/karpenter --- .golangci.yaml | 2 +- go.mod | 2 +- pkg/apis/apis.go | 6 +-- pkg/apis/settings/suite_test.go | 2 +- pkg/apis/v1alpha5/suite_test.go | 4 +- .../v1beta1/nodeclaim_validation_cel_test.go | 2 +- .../nodeclaim_validation_webhook_test.go | 2 +- .../v1beta1/nodepool_validation_cel_test.go | 2 +- .../nodepool_validation_webhook_test.go | 2 +- pkg/apis/v1beta1/suite_test.go | 8 ++-- pkg/cloudprovider/fake/cloudprovider.go | 12 +++--- pkg/cloudprovider/fake/instancetype.go | 8 ++-- pkg/cloudprovider/metrics/cloudprovider.go | 8 ++-- .../metrics/cloudprovider_test.go | 4 +- pkg/cloudprovider/types.go | 6 +-- pkg/controllers/controllers.go | 42 +++++++++---------- pkg/controllers/disruption/consolidation.go | 18 ++++---- .../disruption/consolidation_test.go | 18 ++++---- pkg/controllers/disruption/controller.go | 14 +++---- pkg/controllers/disruption/drift.go | 14 +++---- pkg/controllers/disruption/drift_test.go | 14 +++---- pkg/controllers/disruption/emptiness.go | 4 +- pkg/controllers/disruption/emptiness_test.go | 8 ++-- .../disruption/emptynodeconsolidation.go | 2 +- pkg/controllers/disruption/events/events.go | 4 +- pkg/controllers/disruption/expiration.go | 12 +++--- pkg/controllers/disruption/expiration_test.go | 12 +++--- pkg/controllers/disruption/helpers.go | 24 +++++------ pkg/controllers/disruption/metrics.go | 2 +- .../disruption/multinodeconsolidation.go | 6 +-- .../disruption/orchestration/metrics.go | 2 +- .../disruption/orchestration/queue.go | 14 +++---- .../disruption/orchestration/suite_test.go | 26 ++++++------ .../disruption/singlenodeconsolidation.go | 2 +- pkg/controllers/disruption/suite_test.go | 30 ++++++------- pkg/controllers/disruption/types.go | 14 +++---- pkg/controllers/disruption/validation.go | 14 +++---- .../leasegarbagecollection/controller.go | 10 ++--- .../leasegarbagecollection/metrics.go | 2 +- .../leasegarbagecollection/suite_test.go | 14 +++---- pkg/controllers/metrics/node/controller.go | 12 +++--- pkg/controllers/metrics/node/suite_test.go | 20 ++++----- .../metrics/nodepool/controller.go | 12 +++--- .../metrics/nodepool/suite_test.go | 14 +++---- pkg/controllers/metrics/pod/controller.go | 8 ++-- pkg/controllers/metrics/pod/suite_test.go | 10 ++--- .../node/termination/controller.go | 26 ++++++------ pkg/controllers/node/termination/metrics.go | 2 +- .../node/termination/suite_test.go | 20 ++++----- .../termination/terminator/events/events.go | 2 +- .../node/termination/terminator/eviction.go | 6 +-- .../node/termination/terminator/suite_test.go | 12 +++--- .../node/termination/terminator/terminator.go | 6 +-- .../nodeclaim/consistency/controller.go | 18 ++++---- .../nodeclaim/consistency/events.go | 4 +- .../nodeclaim/consistency/metrics.go | 2 +- .../nodeclaim/consistency/nodeshape.go | 4 +- .../nodeclaim/consistency/suite_test.go | 20 ++++----- .../nodeclaim/consistency/termination.go | 6 +-- .../nodeclaim/disruption/controller.go | 22 +++++----- pkg/controllers/nodeclaim/disruption/drift.go | 12 +++--- .../nodeclaim/disruption/drift_test.go | 16 +++---- .../nodeclaim/disruption/emptiness.go | 10 ++--- .../nodeclaim/disruption/emptiness_test.go | 6 +-- .../nodeclaim/disruption/expiration.go | 6 +-- .../nodeclaim/disruption/expiration_test.go | 6 +-- .../nodeclaim/disruption/suite_test.go | 22 +++++----- .../nodeclaim/garbagecollection/controller.go | 14 +++---- .../nodeclaim/garbagecollection/suite_test.go | 24 +++++------ .../nodeclaim/lifecycle/controller.go | 22 +++++----- pkg/controllers/nodeclaim/lifecycle/events.go | 4 +- .../nodeclaim/lifecycle/initialization.go | 10 ++--- .../lifecycle/initialization_test.go | 8 ++-- pkg/controllers/nodeclaim/lifecycle/launch.go | 10 ++--- .../nodeclaim/lifecycle/launch_test.go | 10 ++--- .../nodeclaim/lifecycle/liveness.go | 4 +- .../nodeclaim/lifecycle/liveness_test.go | 8 ++-- .../nodeclaim/lifecycle/registration.go | 8 ++-- .../nodeclaim/lifecycle/registration_test.go | 6 +-- .../nodeclaim/lifecycle/suite_test.go | 22 +++++----- .../nodeclaim/termination/controller.go | 20 ++++----- .../nodeclaim/termination/suite_test.go | 26 ++++++------ .../nodepool/counter/controller.go | 20 ++++----- .../nodepool/counter/suite_test.go | 22 +++++----- pkg/controllers/nodepool/hash/controller.go | 14 +++---- pkg/controllers/nodepool/hash/suite_test.go | 16 +++---- pkg/controllers/provisioning/batcher.go | 2 +- pkg/controllers/provisioning/controller.go | 16 +++---- pkg/controllers/provisioning/metrics.go | 2 +- pkg/controllers/provisioning/provisioner.go | 26 ++++++------ .../provisioning/scheduling/events.go | 4 +- .../provisioning/scheduling/existingnode.go | 6 +-- .../scheduling/instance_selection_test.go | 12 +++--- .../provisioning/scheduling/metrics.go | 2 +- .../provisioning/scheduling/nodeclaim.go | 8 ++-- .../scheduling/nodeclaimtemplate.go | 6 +-- .../provisioning/scheduling/preferences.go | 2 +- .../provisioning/scheduling/queue.go | 2 +- .../provisioning/scheduling/scheduler.go | 18 ++++---- .../scheduling/scheduling_benchmark_test.go | 14 +++---- .../provisioning/scheduling/suite_test.go | 30 ++++++------- .../provisioning/scheduling/topology.go | 8 ++-- .../provisioning/scheduling/topology_test.go | 8 ++-- .../provisioning/scheduling/topologygroup.go | 4 +- .../scheduling/topologynodefilter.go | 4 +- .../provisioning/scheduling/volumetopology.go | 2 +- pkg/controllers/provisioning/suite_test.go | 26 ++++++------ pkg/controllers/state/cluster.go | 8 ++-- pkg/controllers/state/informer/daemonset.go | 10 ++--- pkg/controllers/state/informer/node.go | 10 ++--- pkg/controllers/state/informer/nodeclaim.go | 12 +++--- pkg/controllers/state/informer/nodepool.go | 16 +++---- pkg/controllers/state/informer/pod.go | 10 ++--- pkg/controllers/state/statenode.go | 12 +++--- pkg/controllers/state/suite_test.go | 24 +++++------ .../state/zz_generated.deepcopy.go | 4 +- pkg/events/suite_test.go | 10 ++--- pkg/metrics/suite_test.go | 4 +- pkg/operator/controller/singleton.go | 2 +- pkg/operator/controller/suite_test.go | 12 +++--- pkg/operator/controller/typed.go | 4 +- pkg/operator/injection/fake/settings.go | 2 +- pkg/operator/injection/injection.go | 4 +- pkg/operator/injection/suite_test.go | 12 +++--- pkg/operator/logging/logging.go | 4 +- pkg/operator/operator.go | 18 ++++---- pkg/operator/options/options.go | 4 +- pkg/operator/options/suite_test.go | 6 +-- pkg/operator/scheme/scheme.go | 2 +- pkg/scheduling/requirement.go | 2 +- pkg/scheduling/requirements.go | 6 +-- pkg/scheduling/storageclass.go | 2 +- pkg/test/environment.go | 6 +-- pkg/test/eventrecorder.go | 2 +- pkg/test/expectations/expectations.go | 22 +++++----- pkg/test/machine.go | 2 +- pkg/test/metadata.go | 2 +- pkg/test/nodeclaim.go | 2 +- pkg/test/nodepool.go | 2 +- pkg/test/nodes.go | 4 +- pkg/test/options.go | 2 +- pkg/test/provisioner.go | 2 +- pkg/test/settings.go | 2 +- pkg/utils/atomic/lazy.go | 2 +- pkg/utils/atomic/suite_test.go | 2 +- pkg/utils/node/node.go | 2 +- pkg/utils/nodeclaim/nodeclaim.go | 6 +-- pkg/utils/nodeclaim/suite_test.go | 18 ++++---- pkg/utils/nodepool/nodepool.go | 4 +- pkg/utils/nodepool/suite_test.go | 16 +++---- pkg/utils/pod/scheduling.go | 6 +-- pkg/utils/resources/resources.go | 2 +- pkg/webhooks/webhooks.go | 8 ++-- 153 files changed, 740 insertions(+), 740 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index bd02a142d..76eb27a59 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -52,7 +52,7 @@ linters-settings: locale: US ignore-words: [] goimports: - local-prefixes: github.com/aws/karpenter-core + local-prefixes: sigs.k8s.io/karpenter goheader: template: |- Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/go.mod b/go.mod index 0dbd96c9b..91ca9f0b1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/aws/karpenter-core +module sigs.k8s.io/karpenter go 1.21 diff --git a/pkg/apis/apis.go b/pkg/apis/apis.go index 0d0c35ff1..89ffb7eef 100644 --- a/pkg/apis/apis.go +++ b/pkg/apis/apis.go @@ -21,9 +21,9 @@ import ( v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/aws/karpenter-core/pkg/apis/settings" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/utils/functional" + "sigs.k8s.io/karpenter/pkg/apis/settings" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/utils/functional" ) var ( diff --git a/pkg/apis/settings/suite_test.go b/pkg/apis/settings/suite_test.go index 33670b989..b0636e229 100644 --- a/pkg/apis/settings/suite_test.go +++ b/pkg/apis/settings/suite_test.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/api/core/v1" . "knative.dev/pkg/logging/testing" - "github.com/aws/karpenter-core/pkg/apis/settings" + "sigs.k8s.io/karpenter/pkg/apis/settings" ) var ctx context.Context diff --git a/pkg/apis/v1alpha5/suite_test.go b/pkg/apis/v1alpha5/suite_test.go index 2406da79b..7bcfc9baa 100644 --- a/pkg/apis/v1alpha5/suite_test.go +++ b/pkg/apis/v1alpha5/suite_test.go @@ -31,8 +31,8 @@ import ( . "knative.dev/pkg/logging/testing" "knative.dev/pkg/ptr" - . "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/test" + . "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/test" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/apis/v1beta1/nodeclaim_validation_cel_test.go b/pkg/apis/v1beta1/nodeclaim_validation_cel_test.go index 93e6128a2..c785c0b99 100644 --- a/pkg/apis/v1beta1/nodeclaim_validation_cel_test.go +++ b/pkg/apis/v1beta1/nodeclaim_validation_cel_test.go @@ -25,7 +25,7 @@ import ( . "github.com/onsi/gomega" "knative.dev/pkg/ptr" - . "github.com/aws/karpenter-core/pkg/apis/v1beta1" + . "sigs.k8s.io/karpenter/pkg/apis/v1beta1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/apis/v1beta1/nodeclaim_validation_webhook_test.go b/pkg/apis/v1beta1/nodeclaim_validation_webhook_test.go index 7b33d122c..2ee853166 100644 --- a/pkg/apis/v1beta1/nodeclaim_validation_webhook_test.go +++ b/pkg/apis/v1beta1/nodeclaim_validation_webhook_test.go @@ -25,7 +25,7 @@ import ( . "github.com/onsi/gomega" "knative.dev/pkg/ptr" - . "github.com/aws/karpenter-core/pkg/apis/v1beta1" + . "sigs.k8s.io/karpenter/pkg/apis/v1beta1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/apis/v1beta1/nodepool_validation_cel_test.go b/pkg/apis/v1beta1/nodepool_validation_cel_test.go index 4b8203ec5..f8ff2273e 100644 --- a/pkg/apis/v1beta1/nodepool_validation_cel_test.go +++ b/pkg/apis/v1beta1/nodepool_validation_cel_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "knative.dev/pkg/ptr" - . "github.com/aws/karpenter-core/pkg/apis/v1beta1" + . "sigs.k8s.io/karpenter/pkg/apis/v1beta1" ) var _ = Describe("CEL/Validation", func() { diff --git a/pkg/apis/v1beta1/nodepool_validation_webhook_test.go b/pkg/apis/v1beta1/nodepool_validation_webhook_test.go index 3742492ad..2dfc6bbb2 100644 --- a/pkg/apis/v1beta1/nodepool_validation_webhook_test.go +++ b/pkg/apis/v1beta1/nodepool_validation_webhook_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "knative.dev/pkg/ptr" - . "github.com/aws/karpenter-core/pkg/apis/v1beta1" + . "sigs.k8s.io/karpenter/pkg/apis/v1beta1" ) var _ = Describe("Webhook/Validation", func() { diff --git a/pkg/apis/v1beta1/suite_test.go b/pkg/apis/v1beta1/suite_test.go index 44f92634c..4a52d21a6 100644 --- a/pkg/apis/v1beta1/suite_test.go +++ b/pkg/apis/v1beta1/suite_test.go @@ -22,10 +22,10 @@ import ( . "github.com/onsi/gomega" . "knative.dev/pkg/logging/testing" - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/test" - . "github.com/aws/karpenter-core/pkg/test/expectations" + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/test" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var ctx context.Context diff --git a/pkg/cloudprovider/fake/cloudprovider.go b/pkg/cloudprovider/fake/cloudprovider.go index e9789548e..98439098f 100644 --- a/pkg/cloudprovider/fake/cloudprovider.go +++ b/pkg/cloudprovider/fake/cloudprovider.go @@ -27,12 +27,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/scheduling" - "github.com/aws/karpenter-core/pkg/test" - "github.com/aws/karpenter-core/pkg/utils/functional" - "github.com/aws/karpenter-core/pkg/utils/resources" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/test" + "sigs.k8s.io/karpenter/pkg/utils/functional" + "sigs.k8s.io/karpenter/pkg/utils/resources" ) var _ cloudprovider.CloudProvider = (*CloudProvider)(nil) diff --git a/pkg/cloudprovider/fake/instancetype.go b/pkg/cloudprovider/fake/instancetype.go index 120025976..52ba8ea63 100644 --- a/pkg/cloudprovider/fake/instancetype.go +++ b/pkg/cloudprovider/fake/instancetype.go @@ -24,10 +24,10 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/scheduling" ) const ( diff --git a/pkg/cloudprovider/metrics/cloudprovider.go b/pkg/cloudprovider/metrics/cloudprovider.go index 733783d70..e0239421b 100644 --- a/pkg/cloudprovider/metrics/cloudprovider.go +++ b/pkg/cloudprovider/metrics/cloudprovider.go @@ -20,11 +20,11 @@ import ( "github.com/prometheus/client_golang/prometheus" crmetrics "sigs.k8s.io/controller-runtime/pkg/metrics" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/operator/injection" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/operator/injection" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/metrics" ) const ( diff --git a/pkg/cloudprovider/metrics/cloudprovider_test.go b/pkg/cloudprovider/metrics/cloudprovider_test.go index b96187e26..2e18cc90f 100644 --- a/pkg/cloudprovider/metrics/cloudprovider_test.go +++ b/pkg/cloudprovider/metrics/cloudprovider_test.go @@ -20,8 +20,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/cloudprovider/metrics" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/cloudprovider/metrics" ) var _ = Describe("Cloudprovider", func() { diff --git a/pkg/cloudprovider/types.go b/pkg/cloudprovider/types.go index a7a3c3d17..0cb2066fd 100644 --- a/pkg/cloudprovider/types.go +++ b/pkg/cloudprovider/types.go @@ -25,9 +25,9 @@ import ( "github.com/samber/lo" v1 "k8s.io/api/core/v1" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/scheduling" - "github.com/aws/karpenter-core/pkg/utils/resources" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/utils/resources" ) type DriftReason string diff --git a/pkg/controllers/controllers.go b/pkg/controllers/controllers.go index 9bb21deb9..f1f775997 100644 --- a/pkg/controllers/controllers.go +++ b/pkg/controllers/controllers.go @@ -19,27 +19,27 @@ import ( "k8s.io/utils/clock" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/controllers/disruption" - "github.com/aws/karpenter-core/pkg/controllers/disruption/orchestration" - "github.com/aws/karpenter-core/pkg/controllers/leasegarbagecollection" - metricsnode "github.com/aws/karpenter-core/pkg/controllers/metrics/node" - metricsnodepool "github.com/aws/karpenter-core/pkg/controllers/metrics/nodepool" - metricspod "github.com/aws/karpenter-core/pkg/controllers/metrics/pod" - "github.com/aws/karpenter-core/pkg/controllers/node/termination" - "github.com/aws/karpenter-core/pkg/controllers/node/termination/terminator" - nodeclaimconsistency "github.com/aws/karpenter-core/pkg/controllers/nodeclaim/consistency" - nodeclaimdisruption "github.com/aws/karpenter-core/pkg/controllers/nodeclaim/disruption" - nodeclaimgarbagecollection "github.com/aws/karpenter-core/pkg/controllers/nodeclaim/garbagecollection" - nodeclaimlifecycle "github.com/aws/karpenter-core/pkg/controllers/nodeclaim/lifecycle" - nodeclaimtermination "github.com/aws/karpenter-core/pkg/controllers/nodeclaim/termination" - nodepoolcounter "github.com/aws/karpenter-core/pkg/controllers/nodepool/counter" - nodepoolhash "github.com/aws/karpenter-core/pkg/controllers/nodepool/hash" - "github.com/aws/karpenter-core/pkg/controllers/provisioning" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/controllers/state/informer" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/controllers/disruption" + "sigs.k8s.io/karpenter/pkg/controllers/disruption/orchestration" + "sigs.k8s.io/karpenter/pkg/controllers/leasegarbagecollection" + metricsnode "sigs.k8s.io/karpenter/pkg/controllers/metrics/node" + metricsnodepool "sigs.k8s.io/karpenter/pkg/controllers/metrics/nodepool" + metricspod "sigs.k8s.io/karpenter/pkg/controllers/metrics/pod" + "sigs.k8s.io/karpenter/pkg/controllers/node/termination" + "sigs.k8s.io/karpenter/pkg/controllers/node/termination/terminator" + nodeclaimconsistency "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/consistency" + nodeclaimdisruption "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/disruption" + nodeclaimgarbagecollection "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/garbagecollection" + nodeclaimlifecycle "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/lifecycle" + nodeclaimtermination "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/termination" + nodepoolcounter "sigs.k8s.io/karpenter/pkg/controllers/nodepool/counter" + nodepoolhash "sigs.k8s.io/karpenter/pkg/controllers/nodepool/hash" + "sigs.k8s.io/karpenter/pkg/controllers/provisioning" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/controllers/state/informer" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/operator/controller" ) func NewControllers( diff --git a/pkg/controllers/disruption/consolidation.go b/pkg/controllers/disruption/consolidation.go index cec55ffd7..8ff3634c6 100644 --- a/pkg/controllers/disruption/consolidation.go +++ b/pkg/controllers/disruption/consolidation.go @@ -25,15 +25,15 @@ import ( "k8s.io/utils/clock" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - disruptionevents "github.com/aws/karpenter-core/pkg/controllers/disruption/events" - "github.com/aws/karpenter-core/pkg/controllers/disruption/orchestration" - "github.com/aws/karpenter-core/pkg/controllers/provisioning" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + disruptionevents "sigs.k8s.io/karpenter/pkg/controllers/disruption/events" + "sigs.k8s.io/karpenter/pkg/controllers/disruption/orchestration" + "sigs.k8s.io/karpenter/pkg/controllers/provisioning" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/scheduling" ) // consolidationTTL is the TTL between creating a consolidation command and validating that it still works. diff --git a/pkg/controllers/disruption/consolidation_test.go b/pkg/controllers/disruption/consolidation_test.go index 6c6c4b4d6..d74b13a6b 100644 --- a/pkg/controllers/disruption/consolidation_test.go +++ b/pkg/controllers/disruption/consolidation_test.go @@ -36,15 +36,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - "github.com/aws/karpenter-core/pkg/controllers/disruption" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/scheduling" - "github.com/aws/karpenter-core/pkg/test" - . "github.com/aws/karpenter-core/pkg/test/expectations" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + "sigs.k8s.io/karpenter/pkg/controllers/disruption" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/test" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var _ = Describe("Consolidation", func() { diff --git a/pkg/controllers/disruption/controller.go b/pkg/controllers/disruption/controller.go index 676953fe3..c157b2ef2 100644 --- a/pkg/controllers/disruption/controller.go +++ b/pkg/controllers/disruption/controller.go @@ -28,13 +28,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/controllers/disruption/orchestration" - "github.com/aws/karpenter-core/pkg/controllers/provisioning" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/metrics" - "github.com/aws/karpenter-core/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/controllers/disruption/orchestration" + "sigs.k8s.io/karpenter/pkg/controllers/provisioning" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/operator/controller" ) type Controller struct { diff --git a/pkg/controllers/disruption/drift.go b/pkg/controllers/disruption/drift.go index aafc3da42..ca9c827de 100644 --- a/pkg/controllers/disruption/drift.go +++ b/pkg/controllers/disruption/drift.go @@ -24,13 +24,13 @@ import ( "github.com/samber/lo" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - disruptionevents "github.com/aws/karpenter-core/pkg/controllers/disruption/events" - "github.com/aws/karpenter-core/pkg/controllers/provisioning" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/metrics" - "github.com/aws/karpenter-core/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + disruptionevents "sigs.k8s.io/karpenter/pkg/controllers/disruption/events" + "sigs.k8s.io/karpenter/pkg/controllers/provisioning" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/operator/options" ) // Drift is a subreconciler that deletes drifted candidates. diff --git a/pkg/controllers/disruption/drift_test.go b/pkg/controllers/disruption/drift_test.go index 89f14c718..1ea6b4cc7 100644 --- a/pkg/controllers/disruption/drift_test.go +++ b/pkg/controllers/disruption/drift_test.go @@ -29,13 +29,13 @@ import ( "knative.dev/pkg/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - "github.com/aws/karpenter-core/pkg/operator/options" - "github.com/aws/karpenter-core/pkg/test" - . "github.com/aws/karpenter-core/pkg/test/expectations" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + "sigs.k8s.io/karpenter/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/test" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var _ = Describe("Drift", func() { diff --git a/pkg/controllers/disruption/emptiness.go b/pkg/controllers/disruption/emptiness.go index cf3a171e9..3763317d3 100644 --- a/pkg/controllers/disruption/emptiness.go +++ b/pkg/controllers/disruption/emptiness.go @@ -20,8 +20,8 @@ import ( "github.com/samber/lo" "k8s.io/utils/clock" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/metrics" ) // Emptiness is a subreconciler that deletes empty candidates. diff --git a/pkg/controllers/disruption/emptiness_test.go b/pkg/controllers/disruption/emptiness_test.go index 7dbd7b8fd..7344f99ac 100644 --- a/pkg/controllers/disruption/emptiness_test.go +++ b/pkg/controllers/disruption/emptiness_test.go @@ -27,10 +27,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/test" - . "github.com/aws/karpenter-core/pkg/test/expectations" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/test" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var _ = Describe("Emptiness", func() { diff --git a/pkg/controllers/disruption/emptynodeconsolidation.go b/pkg/controllers/disruption/emptynodeconsolidation.go index 57e52cdcc..82777f747 100644 --- a/pkg/controllers/disruption/emptynodeconsolidation.go +++ b/pkg/controllers/disruption/emptynodeconsolidation.go @@ -22,7 +22,7 @@ import ( "github.com/samber/lo" "knative.dev/pkg/logging" - "github.com/aws/karpenter-core/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/metrics" ) // EmptyNodeConsolidation is the consolidation controller that performs multi-nodeclaim consolidation of entirely empty nodes diff --git a/pkg/controllers/disruption/events/events.go b/pkg/controllers/disruption/events/events.go index b4b100189..e14b78175 100644 --- a/pkg/controllers/disruption/events/events.go +++ b/pkg/controllers/disruption/events/events.go @@ -22,8 +22,8 @@ import ( "golang.org/x/text/language" v1 "k8s.io/api/core/v1" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/events" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/events" ) func Launching(nodeClaim *v1beta1.NodeClaim, reason string) events.Event { diff --git a/pkg/controllers/disruption/expiration.go b/pkg/controllers/disruption/expiration.go index 16b926549..73960ecaa 100644 --- a/pkg/controllers/disruption/expiration.go +++ b/pkg/controllers/disruption/expiration.go @@ -27,12 +27,12 @@ import ( "github.com/samber/lo" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - disruptionevents "github.com/aws/karpenter-core/pkg/controllers/disruption/events" - "github.com/aws/karpenter-core/pkg/controllers/provisioning" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + disruptionevents "sigs.k8s.io/karpenter/pkg/controllers/disruption/events" + "sigs.k8s.io/karpenter/pkg/controllers/provisioning" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/metrics" ) // Expiration is a subreconciler that deletes empty candidates. diff --git a/pkg/controllers/disruption/expiration_test.go b/pkg/controllers/disruption/expiration_test.go index 09f74df1a..41c849c07 100644 --- a/pkg/controllers/disruption/expiration_test.go +++ b/pkg/controllers/disruption/expiration_test.go @@ -29,12 +29,12 @@ import ( "knative.dev/pkg/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - "github.com/aws/karpenter-core/pkg/test" - . "github.com/aws/karpenter-core/pkg/test/expectations" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + "sigs.k8s.io/karpenter/pkg/test" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var _ = Describe("Expiration", func() { diff --git a/pkg/controllers/disruption/helpers.go b/pkg/controllers/disruption/helpers.go index 241bae193..24fc939eb 100644 --- a/pkg/controllers/disruption/helpers.go +++ b/pkg/controllers/disruption/helpers.go @@ -28,18 +28,18 @@ import ( "knative.dev/pkg/logging" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - disruptionevents "github.com/aws/karpenter-core/pkg/controllers/disruption/events" - "github.com/aws/karpenter-core/pkg/controllers/disruption/orchestration" - "github.com/aws/karpenter-core/pkg/controllers/provisioning" - pscheduling "github.com/aws/karpenter-core/pkg/controllers/provisioning/scheduling" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/scheduling" - nodeutils "github.com/aws/karpenter-core/pkg/utils/node" - nodepoolutil "github.com/aws/karpenter-core/pkg/utils/nodepool" - "github.com/aws/karpenter-core/pkg/utils/pod" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + disruptionevents "sigs.k8s.io/karpenter/pkg/controllers/disruption/events" + "sigs.k8s.io/karpenter/pkg/controllers/disruption/orchestration" + "sigs.k8s.io/karpenter/pkg/controllers/provisioning" + pscheduling "sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/scheduling" + nodeutils "sigs.k8s.io/karpenter/pkg/utils/node" + nodepoolutil "sigs.k8s.io/karpenter/pkg/utils/nodepool" + "sigs.k8s.io/karpenter/pkg/utils/pod" ) func filterCandidates(ctx context.Context, kubeClient client.Client, recorder events.Recorder, nodes []*Candidate) ([]*Candidate, error) { diff --git a/pkg/controllers/disruption/metrics.go b/pkg/controllers/disruption/metrics.go index 235f3fbe1..da4a9fcd5 100644 --- a/pkg/controllers/disruption/metrics.go +++ b/pkg/controllers/disruption/metrics.go @@ -18,7 +18,7 @@ import ( "github.com/prometheus/client_golang/prometheus" crmetrics "sigs.k8s.io/controller-runtime/pkg/metrics" - "github.com/aws/karpenter-core/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/metrics" ) func init() { diff --git a/pkg/controllers/disruption/multinodeconsolidation.go b/pkg/controllers/disruption/multinodeconsolidation.go index f88776a5b..d208cdde8 100644 --- a/pkg/controllers/disruption/multinodeconsolidation.go +++ b/pkg/controllers/disruption/multinodeconsolidation.go @@ -24,9 +24,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "knative.dev/pkg/logging" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/controllers/provisioning/scheduling" - "github.com/aws/karpenter-core/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling" + "sigs.k8s.io/karpenter/pkg/metrics" ) const MultiNodeConsolidationTimeoutDuration = 1 * time.Minute diff --git a/pkg/controllers/disruption/orchestration/metrics.go b/pkg/controllers/disruption/orchestration/metrics.go index faf9b83ff..6513d9b4d 100644 --- a/pkg/controllers/disruption/orchestration/metrics.go +++ b/pkg/controllers/disruption/orchestration/metrics.go @@ -18,7 +18,7 @@ import ( "github.com/prometheus/client_golang/prometheus" crmetrics "sigs.k8s.io/controller-runtime/pkg/metrics" - "github.com/aws/karpenter-core/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/metrics" ) func init() { diff --git a/pkg/controllers/disruption/orchestration/queue.go b/pkg/controllers/disruption/orchestration/queue.go index f5cd9f2af..7d97fc4d8 100644 --- a/pkg/controllers/disruption/orchestration/queue.go +++ b/pkg/controllers/disruption/orchestration/queue.go @@ -32,16 +32,16 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/controllers/provisioning" - "github.com/aws/karpenter-core/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/controllers/provisioning" + "sigs.k8s.io/karpenter/pkg/operator/controller" "sigs.k8s.io/controller-runtime/pkg/controller/controllertest" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - disruptionevents "github.com/aws/karpenter-core/pkg/controllers/disruption/events" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/utils/nodeclaim" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + disruptionevents "sigs.k8s.io/karpenter/pkg/controllers/disruption/events" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/utils/nodeclaim" ) const ( diff --git a/pkg/controllers/disruption/orchestration/suite_test.go b/pkg/controllers/disruption/orchestration/suite_test.go index e3cfc11e2..a440a58f9 100644 --- a/pkg/controllers/disruption/orchestration/suite_test.go +++ b/pkg/controllers/disruption/orchestration/suite_test.go @@ -27,19 +27,19 @@ import ( . "knative.dev/pkg/logging/testing" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/apis/settings" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - disruptionevents "github.com/aws/karpenter-core/pkg/controllers/disruption/events" - "github.com/aws/karpenter-core/pkg/controllers/disruption/orchestration" - "github.com/aws/karpenter-core/pkg/controllers/provisioning" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/controllers/state/informer" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/test" - . "github.com/aws/karpenter-core/pkg/test/expectations" + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/apis/settings" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + disruptionevents "sigs.k8s.io/karpenter/pkg/controllers/disruption/events" + "sigs.k8s.io/karpenter/pkg/controllers/disruption/orchestration" + "sigs.k8s.io/karpenter/pkg/controllers/provisioning" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/controllers/state/informer" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/test" + . "sigs.k8s.io/karpenter/pkg/test/expectations" v1 "k8s.io/api/core/v1" clock "k8s.io/utils/clock/testing" diff --git a/pkg/controllers/disruption/singlenodeconsolidation.go b/pkg/controllers/disruption/singlenodeconsolidation.go index 767c28a1f..2fb083838 100644 --- a/pkg/controllers/disruption/singlenodeconsolidation.go +++ b/pkg/controllers/disruption/singlenodeconsolidation.go @@ -21,7 +21,7 @@ import ( "knative.dev/pkg/logging" - "github.com/aws/karpenter-core/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/metrics" ) const SingleNodeConsolidationTimeoutDuration = 3 * time.Minute diff --git a/pkg/controllers/disruption/suite_test.go b/pkg/controllers/disruption/suite_test.go index e3c68bc76..93834a02d 100644 --- a/pkg/controllers/disruption/suite_test.go +++ b/pkg/controllers/disruption/suite_test.go @@ -36,21 +36,21 @@ import ( "knative.dev/pkg/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - coreapis "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - "github.com/aws/karpenter-core/pkg/controllers/disruption" - "github.com/aws/karpenter-core/pkg/controllers/disruption/orchestration" - "github.com/aws/karpenter-core/pkg/controllers/provisioning" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/controllers/state/informer" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/options" - "github.com/aws/karpenter-core/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/scheduling" - "github.com/aws/karpenter-core/pkg/test" - . "github.com/aws/karpenter-core/pkg/test/expectations" + coreapis "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + "sigs.k8s.io/karpenter/pkg/controllers/disruption" + "sigs.k8s.io/karpenter/pkg/controllers/disruption/orchestration" + "sigs.k8s.io/karpenter/pkg/controllers/provisioning" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/controllers/state/informer" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/test" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var ctx context.Context diff --git a/pkg/controllers/disruption/types.go b/pkg/controllers/disruption/types.go index 15bdf2b59..54173d3a6 100644 --- a/pkg/controllers/disruption/types.go +++ b/pkg/controllers/disruption/types.go @@ -24,13 +24,13 @@ import ( "knative.dev/pkg/logging" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - disruptionevents "github.com/aws/karpenter-core/pkg/controllers/disruption/events" - "github.com/aws/karpenter-core/pkg/controllers/disruption/orchestration" - "github.com/aws/karpenter-core/pkg/controllers/provisioning/scheduling" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/events" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + disruptionevents "sigs.k8s.io/karpenter/pkg/controllers/disruption/events" + "sigs.k8s.io/karpenter/pkg/controllers/disruption/orchestration" + "sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/events" ) type Method interface { diff --git a/pkg/controllers/disruption/validation.go b/pkg/controllers/disruption/validation.go index 35cf1338a..c86a70dff 100644 --- a/pkg/controllers/disruption/validation.go +++ b/pkg/controllers/disruption/validation.go @@ -24,13 +24,13 @@ import ( "k8s.io/utils/clock" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/controllers/disruption/orchestration" - "github.com/aws/karpenter-core/pkg/controllers/provisioning" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/events" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/controllers/disruption/orchestration" + "sigs.k8s.io/karpenter/pkg/controllers/provisioning" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/events" ) // Validation is used to perform validation on a consolidation command. It makes an assumption that when re-used, all diff --git a/pkg/controllers/leasegarbagecollection/controller.go b/pkg/controllers/leasegarbagecollection/controller.go index 46eb16527..d4faea6f3 100644 --- a/pkg/controllers/leasegarbagecollection/controller.go +++ b/pkg/controllers/leasegarbagecollection/controller.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - corecontroller "github.com/aws/karpenter-core/pkg/operator/controller" + operatorcontroller "sigs.k8s.io/karpenter/pkg/operator/controller" ) // Controller for the resource @@ -35,8 +35,8 @@ type Controller struct { } // NewController is a constructor -func NewController(kubeClient client.Client) corecontroller.Controller { - return corecontroller.Typed[*v1.Lease](kubeClient, &Controller{ +func NewController(kubeClient client.Client) operatorcontroller.Controller { + return operatorcontroller.Typed[*v1.Lease](kubeClient, &Controller{ kubeClient: kubeClient, }) } @@ -59,8 +59,8 @@ func (c *Controller) Reconcile(ctx context.Context, l *v1.Lease) (reconcile.Resu return reconcile.Result{}, client.IgnoreNotFound(err) } -func (c *Controller) Builder(_ context.Context, m manager.Manager) corecontroller.Builder { - return corecontroller.Adapt(controllerruntime. +func (c *Controller) Builder(_ context.Context, m manager.Manager) operatorcontroller.Builder { + return operatorcontroller.Adapt(controllerruntime. NewControllerManagedBy(m). WithEventFilter(predicate.GenerationChangedPredicate{}). For(&v1.Lease{}). diff --git a/pkg/controllers/leasegarbagecollection/metrics.go b/pkg/controllers/leasegarbagecollection/metrics.go index e95097f14..b2c669eec 100644 --- a/pkg/controllers/leasegarbagecollection/metrics.go +++ b/pkg/controllers/leasegarbagecollection/metrics.go @@ -18,7 +18,7 @@ import ( "github.com/prometheus/client_golang/prometheus" crmetrics "sigs.k8s.io/controller-runtime/pkg/metrics" - "github.com/aws/karpenter-core/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/metrics" ) var ( diff --git a/pkg/controllers/leasegarbagecollection/suite_test.go b/pkg/controllers/leasegarbagecollection/suite_test.go index de8cdc74c..a28dda3f7 100644 --- a/pkg/controllers/leasegarbagecollection/suite_test.go +++ b/pkg/controllers/leasegarbagecollection/suite_test.go @@ -25,18 +25,18 @@ import ( "github.com/samber/lo" - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/controllers/leasegarbagecollection" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/options" - "github.com/aws/karpenter-core/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/controllers/leasegarbagecollection" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/test" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "knative.dev/pkg/logging/testing" - . "github.com/aws/karpenter-core/pkg/test/expectations" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var ctx context.Context diff --git a/pkg/controllers/metrics/node/controller.go b/pkg/controllers/metrics/node/controller.go index 7161c4115..4b5ab942a 100644 --- a/pkg/controllers/metrics/node/controller.go +++ b/pkg/controllers/metrics/node/controller.go @@ -28,12 +28,12 @@ import ( crmetrics "sigs.k8s.io/controller-runtime/pkg/metrics" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/metrics" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/utils/resources" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/utils/resources" ) const ( diff --git a/pkg/controllers/metrics/node/suite_test.go b/pkg/controllers/metrics/node/suite_test.go index 22b5ad429..584774ccb 100644 --- a/pkg/controllers/metrics/node/suite_test.go +++ b/pkg/controllers/metrics/node/suite_test.go @@ -26,22 +26,22 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/controllers/metrics/node" - "github.com/aws/karpenter-core/pkg/controllers/state/informer" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/options" - "github.com/aws/karpenter-core/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/controllers/metrics/node" + "sigs.k8s.io/karpenter/pkg/controllers/state/informer" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/test" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "knative.dev/pkg/logging/testing" - . "github.com/aws/karpenter-core/pkg/test/expectations" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var ctx context.Context diff --git a/pkg/controllers/metrics/nodepool/controller.go b/pkg/controllers/metrics/nodepool/controller.go index b9be2b631..bfa35d083 100644 --- a/pkg/controllers/metrics/nodepool/controller.go +++ b/pkg/controllers/metrics/nodepool/controller.go @@ -31,9 +31,9 @@ import ( crmetrics "sigs.k8s.io/controller-runtime/pkg/metrics" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/metrics" - corecontroller "github.com/aws/karpenter-core/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/metrics" + operatorcontroller "sigs.k8s.io/karpenter/pkg/operator/controller" ) const ( @@ -79,7 +79,7 @@ type Controller struct { } // NewController constructs a controller instance -func NewController(kubeClient client.Client) corecontroller.Controller { +func NewController(kubeClient client.Client) operatorcontroller.Controller { return &Controller{ kubeClient: kubeClient, metricStore: metrics.NewStore(), @@ -135,8 +135,8 @@ func makeLabels(nodePool *v1beta1.NodePool, resourceTypeName string) prometheus. } } -func (c *Controller) Builder(_ context.Context, m manager.Manager) corecontroller.Builder { - return corecontroller.Adapt( +func (c *Controller) Builder(_ context.Context, m manager.Manager) operatorcontroller.Builder { + return operatorcontroller.Adapt( controllerruntime. NewControllerManagedBy(m). For(&v1beta1.NodePool{}), diff --git a/pkg/controllers/metrics/nodepool/suite_test.go b/pkg/controllers/metrics/nodepool/suite_test.go index 98aeb4667..b65b1e56e 100644 --- a/pkg/controllers/metrics/nodepool/suite_test.go +++ b/pkg/controllers/metrics/nodepool/suite_test.go @@ -26,13 +26,13 @@ import ( . "knative.dev/pkg/logging/testing" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/controllers/metrics/nodepool" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/test" - . "github.com/aws/karpenter-core/pkg/test/expectations" + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/controllers/metrics/nodepool" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/test" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var nodePoolController controller.Controller diff --git a/pkg/controllers/metrics/pod/controller.go b/pkg/controllers/metrics/pod/controller.go index 41d9e8986..5e757b88c 100644 --- a/pkg/controllers/metrics/pod/controller.go +++ b/pkg/controllers/metrics/pod/controller.go @@ -32,10 +32,10 @@ import ( crmetrics "sigs.k8s.io/controller-runtime/pkg/metrics" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/metrics" - "github.com/aws/karpenter-core/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/operator/controller" ) const ( diff --git a/pkg/controllers/metrics/pod/suite_test.go b/pkg/controllers/metrics/pod/suite_test.go index 939e43167..7a3126014 100644 --- a/pkg/controllers/metrics/pod/suite_test.go +++ b/pkg/controllers/metrics/pod/suite_test.go @@ -24,11 +24,11 @@ import ( . "knative.dev/pkg/logging/testing" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/controllers/metrics/pod" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/test" - . "github.com/aws/karpenter-core/pkg/test/expectations" + "sigs.k8s.io/karpenter/pkg/controllers/metrics/pod" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/test" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var podController controller.Controller diff --git a/pkg/controllers/node/termination/controller.go b/pkg/controllers/node/termination/controller.go index a0c88daea..587682f55 100644 --- a/pkg/controllers/node/termination/controller.go +++ b/pkg/controllers/node/termination/controller.go @@ -32,17 +32,17 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/controllers/node/termination/terminator" - terminatorevents "github.com/aws/karpenter-core/pkg/controllers/node/termination/terminator/events" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/metrics" - corecontroller "github.com/aws/karpenter-core/pkg/operator/controller" - nodeclaimutil "github.com/aws/karpenter-core/pkg/utils/nodeclaim" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/controllers/node/termination/terminator" + terminatorevents "sigs.k8s.io/karpenter/pkg/controllers/node/termination/terminator/events" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/metrics" + operatorcontroller "sigs.k8s.io/karpenter/pkg/operator/controller" + nodeclaimutil "sigs.k8s.io/karpenter/pkg/utils/nodeclaim" ) -var _ corecontroller.FinalizingTypedController[*v1.Node] = (*Controller)(nil) +var _ operatorcontroller.FinalizingTypedController[*v1.Node] = (*Controller)(nil) // Controller for the resource type Controller struct { @@ -53,8 +53,8 @@ type Controller struct { } // NewController constructs a controller instance -func NewController(kubeClient client.Client, cloudProvider cloudprovider.CloudProvider, terminator *terminator.Terminator, recorder events.Recorder) corecontroller.Controller { - return corecontroller.Typed[*v1.Node](kubeClient, &Controller{ +func NewController(kubeClient client.Client, cloudProvider cloudprovider.CloudProvider, terminator *terminator.Terminator, recorder events.Recorder) operatorcontroller.Controller { + return operatorcontroller.Typed[*v1.Node](kubeClient, &Controller{ kubeClient: kubeClient, cloudProvider: cloudProvider, terminator: terminator, @@ -136,8 +136,8 @@ func (c *Controller) removeFinalizer(ctx context.Context, n *v1.Node) error { return nil } -func (c *Controller) Builder(_ context.Context, m manager.Manager) corecontroller.Builder { - return corecontroller.Adapt(controllerruntime. +func (c *Controller) Builder(_ context.Context, m manager.Manager) operatorcontroller.Builder { + return operatorcontroller.Adapt(controllerruntime. NewControllerManagedBy(m). For(&v1.Node{}). WithOptions( diff --git a/pkg/controllers/node/termination/metrics.go b/pkg/controllers/node/termination/metrics.go index 677296af4..09972c8c0 100644 --- a/pkg/controllers/node/termination/metrics.go +++ b/pkg/controllers/node/termination/metrics.go @@ -18,7 +18,7 @@ import ( "github.com/prometheus/client_golang/prometheus" crmetrics "sigs.k8s.io/controller-runtime/pkg/metrics" - "github.com/aws/karpenter-core/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/metrics" ) var ( diff --git a/pkg/controllers/node/termination/suite_test.go b/pkg/controllers/node/termination/suite_test.go index 71fe8006e..1dee44cd6 100644 --- a/pkg/controllers/node/termination/suite_test.go +++ b/pkg/controllers/node/termination/suite_test.go @@ -25,15 +25,15 @@ import ( clock "k8s.io/utils/clock/testing" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - "github.com/aws/karpenter-core/pkg/controllers/node/termination" - "github.com/aws/karpenter-core/pkg/controllers/node/termination/terminator" - "github.com/aws/karpenter-core/pkg/metrics" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + "sigs.k8s.io/karpenter/pkg/controllers/node/termination" + "sigs.k8s.io/karpenter/pkg/controllers/node/termination/terminator" + "sigs.k8s.io/karpenter/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/test" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -43,7 +43,7 @@ import ( . "knative.dev/pkg/logging/testing" "knative.dev/pkg/ptr" - . "github.com/aws/karpenter-core/pkg/test/expectations" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var ctx context.Context diff --git a/pkg/controllers/node/termination/terminator/events/events.go b/pkg/controllers/node/termination/terminator/events/events.go index 019d5eecc..8eae25356 100644 --- a/pkg/controllers/node/termination/terminator/events/events.go +++ b/pkg/controllers/node/termination/terminator/events/events.go @@ -19,7 +19,7 @@ import ( v1 "k8s.io/api/core/v1" - "github.com/aws/karpenter-core/pkg/events" + "sigs.k8s.io/karpenter/pkg/events" ) func EvictPod(pod *v1.Pod) events.Event { diff --git a/pkg/controllers/node/termination/terminator/eviction.go b/pkg/controllers/node/termination/terminator/eviction.go index 112e17d35..fa7b70cdf 100644 --- a/pkg/controllers/node/termination/terminator/eviction.go +++ b/pkg/controllers/node/termination/terminator/eviction.go @@ -33,10 +33,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - terminatorevents "github.com/aws/karpenter-core/pkg/controllers/node/termination/terminator/events" - "github.com/aws/karpenter-core/pkg/operator/controller" + terminatorevents "sigs.k8s.io/karpenter/pkg/controllers/node/termination/terminator/events" + "sigs.k8s.io/karpenter/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/events" + "sigs.k8s.io/karpenter/pkg/events" ) const ( diff --git a/pkg/controllers/node/termination/terminator/suite_test.go b/pkg/controllers/node/termination/terminator/suite_test.go index 0020749be..103daa3fc 100644 --- a/pkg/controllers/node/termination/terminator/suite_test.go +++ b/pkg/controllers/node/termination/terminator/suite_test.go @@ -29,13 +29,13 @@ import ( v1 "k8s.io/api/core/v1" - "github.com/aws/karpenter-core/pkg/controllers/node/termination/terminator" + "sigs.k8s.io/karpenter/pkg/controllers/node/termination/terminator" - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/operator/options" - "github.com/aws/karpenter-core/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/test" - . "github.com/aws/karpenter-core/pkg/test/expectations" + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/test" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var ctx context.Context diff --git a/pkg/controllers/node/termination/terminator/terminator.go b/pkg/controllers/node/termination/terminator/terminator.go index c074cd81d..b4848d2c8 100644 --- a/pkg/controllers/node/termination/terminator/terminator.go +++ b/pkg/controllers/node/termination/terminator/terminator.go @@ -26,9 +26,9 @@ import ( "knative.dev/pkg/logging" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - podutil "github.com/aws/karpenter-core/pkg/utils/pod" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + podutil "sigs.k8s.io/karpenter/pkg/utils/pod" ) type Terminator struct { diff --git a/pkg/controllers/nodeclaim/consistency/controller.go b/pkg/controllers/nodeclaim/consistency/controller.go index 23cf15057..5f268a0b4 100644 --- a/pkg/controllers/nodeclaim/consistency/controller.go +++ b/pkg/controllers/nodeclaim/consistency/controller.go @@ -31,11 +31,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/events" - corecontroller "github.com/aws/karpenter-core/pkg/operator/controller" - nodeclaimutil "github.com/aws/karpenter-core/pkg/utils/nodeclaim" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/events" + operatorcontroller "sigs.k8s.io/karpenter/pkg/operator/controller" + nodeclaimutil "sigs.k8s.io/karpenter/pkg/utils/nodeclaim" ) type Controller struct { @@ -112,9 +112,9 @@ type NodeClaimController struct { } func NewNodeClaimController(clk clock.Clock, kubeClient client.Client, recorder events.Recorder, - provider cloudprovider.CloudProvider) corecontroller.Controller { + provider cloudprovider.CloudProvider) operatorcontroller.Controller { - return corecontroller.Typed[*v1beta1.NodeClaim](kubeClient, &NodeClaimController{ + return operatorcontroller.Typed[*v1beta1.NodeClaim](kubeClient, &NodeClaimController{ Controller: NewController(clk, kubeClient, recorder, provider), }) } @@ -127,8 +127,8 @@ func (c *NodeClaimController) Reconcile(ctx context.Context, nodeClaim *v1beta1. return c.Controller.Reconcile(ctx, nodeClaim) } -func (c *NodeClaimController) Builder(_ context.Context, m manager.Manager) corecontroller.Builder { - return corecontroller.Adapt(controllerruntime. +func (c *NodeClaimController) Builder(_ context.Context, m manager.Manager) operatorcontroller.Builder { + return operatorcontroller.Adapt(controllerruntime. NewControllerManagedBy(m). For(&v1beta1.NodeClaim{}). Watches( diff --git a/pkg/controllers/nodeclaim/consistency/events.go b/pkg/controllers/nodeclaim/consistency/events.go index 9b44296f0..08724da1e 100644 --- a/pkg/controllers/nodeclaim/consistency/events.go +++ b/pkg/controllers/nodeclaim/consistency/events.go @@ -17,8 +17,8 @@ package consistency import ( v1 "k8s.io/api/core/v1" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/events" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/events" ) func FailedConsistencyCheckEvent(nodeClaim *v1beta1.NodeClaim, message string) events.Event { diff --git a/pkg/controllers/nodeclaim/consistency/metrics.go b/pkg/controllers/nodeclaim/consistency/metrics.go index 1e5227447..2dbaf8f7b 100644 --- a/pkg/controllers/nodeclaim/consistency/metrics.go +++ b/pkg/controllers/nodeclaim/consistency/metrics.go @@ -18,7 +18,7 @@ import ( "github.com/prometheus/client_golang/prometheus" crmetrics "sigs.k8s.io/controller-runtime/pkg/metrics" - "github.com/aws/karpenter-core/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/metrics" ) func init() { diff --git a/pkg/controllers/nodeclaim/consistency/nodeshape.go b/pkg/controllers/nodeclaim/consistency/nodeshape.go index 6b40eb252..be97cd831 100644 --- a/pkg/controllers/nodeclaim/consistency/nodeshape.go +++ b/pkg/controllers/nodeclaim/consistency/nodeshape.go @@ -20,8 +20,8 @@ import ( v1 "k8s.io/api/core/v1" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" ) // NodeShape detects nodes that have launched with 10% or less of any resource than was expected. diff --git a/pkg/controllers/nodeclaim/consistency/suite_test.go b/pkg/controllers/nodeclaim/consistency/suite_test.go index f53240807..439ad85f9 100644 --- a/pkg/controllers/nodeclaim/consistency/suite_test.go +++ b/pkg/controllers/nodeclaim/consistency/suite_test.go @@ -31,16 +31,16 @@ import ( "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/controllers/nodeclaim/consistency" - . "github.com/aws/karpenter-core/pkg/test/expectations" - - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/options" - "github.com/aws/karpenter-core/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/consistency" + . "sigs.k8s.io/karpenter/pkg/test/expectations" + + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/test" ) var ctx context.Context diff --git a/pkg/controllers/nodeclaim/consistency/termination.go b/pkg/controllers/nodeclaim/consistency/termination.go index 94b9411ee..655df10a5 100644 --- a/pkg/controllers/nodeclaim/consistency/termination.go +++ b/pkg/controllers/nodeclaim/consistency/termination.go @@ -21,9 +21,9 @@ import ( v1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/controllers/disruption" - nodeutils "github.com/aws/karpenter-core/pkg/utils/node" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/controllers/disruption" + nodeutils "sigs.k8s.io/karpenter/pkg/utils/node" ) // Termination detects nodes that are stuck terminating and reports why. diff --git a/pkg/controllers/nodeclaim/disruption/controller.go b/pkg/controllers/nodeclaim/disruption/controller.go index 9bfc45dbe..505c79b11 100644 --- a/pkg/controllers/nodeclaim/disruption/controller.go +++ b/pkg/controllers/nodeclaim/disruption/controller.go @@ -32,12 +32,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/controllers/state" - corecontroller "github.com/aws/karpenter-core/pkg/operator/controller" - nodeclaimutil "github.com/aws/karpenter-core/pkg/utils/nodeclaim" - "github.com/aws/karpenter-core/pkg/utils/result" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/controllers/state" + operatorcontroller "sigs.k8s.io/karpenter/pkg/operator/controller" + nodeclaimutil "sigs.k8s.io/karpenter/pkg/utils/nodeclaim" + "sigs.k8s.io/karpenter/pkg/utils/result" ) type nodeClaimReconciler interface { @@ -105,14 +105,14 @@ func (c *Controller) Reconcile(ctx context.Context, nodeClaim *v1beta1.NodeClaim return result.Min(results...), nil } -var _ corecontroller.TypedController[*v1beta1.NodeClaim] = (*NodeClaimController)(nil) +var _ operatorcontroller.TypedController[*v1beta1.NodeClaim] = (*NodeClaimController)(nil) type NodeClaimController struct { *Controller } -func NewNodeClaimController(clk clock.Clock, kubeClient client.Client, cluster *state.Cluster, cloudProvider cloudprovider.CloudProvider) corecontroller.Controller { - return corecontroller.Typed[*v1beta1.NodeClaim](kubeClient, &NodeClaimController{ +func NewNodeClaimController(clk clock.Clock, kubeClient client.Client, cluster *state.Cluster, cloudProvider cloudprovider.CloudProvider) operatorcontroller.Controller { + return operatorcontroller.Typed[*v1beta1.NodeClaim](kubeClient, &NodeClaimController{ Controller: NewController(clk, kubeClient, cluster, cloudProvider), }) } @@ -125,8 +125,8 @@ func (c *NodeClaimController) Reconcile(ctx context.Context, nodeClaim *v1beta1. return c.Controller.Reconcile(ctx, nodeClaim) } -func (c *NodeClaimController) Builder(_ context.Context, m manager.Manager) corecontroller.Builder { - return corecontroller.Adapt(controllerruntime. +func (c *NodeClaimController) Builder(_ context.Context, m manager.Manager) operatorcontroller.Builder { + return operatorcontroller.Adapt(controllerruntime. NewControllerManagedBy(m). For(&v1beta1.NodeClaim{}, builder.WithPredicates( predicate.Or( diff --git a/pkg/controllers/nodeclaim/disruption/drift.go b/pkg/controllers/nodeclaim/disruption/drift.go index 8db171c8e..bc956a525 100644 --- a/pkg/controllers/nodeclaim/disruption/drift.go +++ b/pkg/controllers/nodeclaim/disruption/drift.go @@ -26,12 +26,12 @@ import ( "github.com/samber/lo" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/metrics" - "github.com/aws/karpenter-core/pkg/operator/options" - "github.com/aws/karpenter-core/pkg/scheduling" - nodeclaimutil "github.com/aws/karpenter-core/pkg/utils/nodeclaim" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/scheduling" + nodeclaimutil "sigs.k8s.io/karpenter/pkg/utils/nodeclaim" ) const ( diff --git a/pkg/controllers/nodeclaim/disruption/drift_test.go b/pkg/controllers/nodeclaim/disruption/drift_test.go index 0eb3af606..e39d46776 100644 --- a/pkg/controllers/nodeclaim/disruption/drift_test.go +++ b/pkg/controllers/nodeclaim/disruption/drift_test.go @@ -21,16 +21,16 @@ import ( "knative.dev/pkg/apis" "knative.dev/pkg/ptr" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/controllers/nodeclaim/disruption" - controllerprov "github.com/aws/karpenter-core/pkg/controllers/nodepool/hash" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/options" - . "github.com/aws/karpenter-core/pkg/test/expectations" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/disruption" + "sigs.k8s.io/karpenter/pkg/controllers/nodepool/hash" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/options" + . "sigs.k8s.io/karpenter/pkg/test/expectations" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/test" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -365,7 +365,7 @@ var _ = Describe("Drift", func() { var nodePoolController controller.Controller BeforeEach(func() { cp.Drifted = "" - nodePoolController = controllerprov.NewNodePoolController(env.Client) + nodePoolController = hash.NewNodePoolController(env.Client) nodePoolOptions = v1beta1.NodePool{ ObjectMeta: nodePool.ObjectMeta, Spec: v1beta1.NodePoolSpec{ diff --git a/pkg/controllers/nodeclaim/disruption/emptiness.go b/pkg/controllers/nodeclaim/disruption/emptiness.go index 7e3519af6..bd87ee95c 100644 --- a/pkg/controllers/nodeclaim/disruption/emptiness.go +++ b/pkg/controllers/nodeclaim/disruption/emptiness.go @@ -26,11 +26,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/metrics" - "github.com/aws/karpenter-core/pkg/utils/node" - nodeclaimutil "github.com/aws/karpenter-core/pkg/utils/nodeclaim" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/utils/node" + nodeclaimutil "sigs.k8s.io/karpenter/pkg/utils/nodeclaim" ) // Emptiness is a machine sub-controller that adds or removes status conditions on empty machines based on TTLSecondsAfterEmpty diff --git a/pkg/controllers/nodeclaim/disruption/emptiness_test.go b/pkg/controllers/nodeclaim/disruption/emptiness_test.go index f0b6e13f4..492f1bf23 100644 --- a/pkg/controllers/nodeclaim/disruption/emptiness_test.go +++ b/pkg/controllers/nodeclaim/disruption/emptiness_test.go @@ -23,13 +23,13 @@ import ( "knative.dev/pkg/apis" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/test" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/aws/karpenter-core/pkg/test/expectations" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var _ = Describe("Emptiness", func() { diff --git a/pkg/controllers/nodeclaim/disruption/expiration.go b/pkg/controllers/nodeclaim/disruption/expiration.go index f4969c33a..0c6d9b0ee 100644 --- a/pkg/controllers/nodeclaim/disruption/expiration.go +++ b/pkg/controllers/nodeclaim/disruption/expiration.go @@ -25,9 +25,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/metrics" - nodeclaimutil "github.com/aws/karpenter-core/pkg/utils/nodeclaim" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/metrics" + nodeclaimutil "sigs.k8s.io/karpenter/pkg/utils/nodeclaim" ) // Expiration is a machine sub-controller that adds or removes status conditions on expired machines based on TTLSecondsUntilExpired diff --git a/pkg/controllers/nodeclaim/disruption/expiration_test.go b/pkg/controllers/nodeclaim/disruption/expiration_test.go index 0c97e13f4..1ba1c0a9c 100644 --- a/pkg/controllers/nodeclaim/disruption/expiration_test.go +++ b/pkg/controllers/nodeclaim/disruption/expiration_test.go @@ -22,13 +22,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/test" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/aws/karpenter-core/pkg/test/expectations" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var _ = Describe("Expiration", func() { diff --git a/pkg/controllers/nodeclaim/disruption/suite_test.go b/pkg/controllers/nodeclaim/disruption/suite_test.go index f7963f2c2..88e7a16c5 100644 --- a/pkg/controllers/nodeclaim/disruption/suite_test.go +++ b/pkg/controllers/nodeclaim/disruption/suite_test.go @@ -29,17 +29,17 @@ import ( "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - nodeclaimdisruption "github.com/aws/karpenter-core/pkg/controllers/nodeclaim/disruption" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/options" - "github.com/aws/karpenter-core/pkg/operator/scheme" - . "github.com/aws/karpenter-core/pkg/test/expectations" - - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + nodeclaimdisruption "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/disruption" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + . "sigs.k8s.io/karpenter/pkg/test/expectations" + + "sigs.k8s.io/karpenter/pkg/test" ) var ctx context.Context diff --git a/pkg/controllers/nodeclaim/garbagecollection/controller.go b/pkg/controllers/nodeclaim/garbagecollection/controller.go index d52d27545..079c83d71 100644 --- a/pkg/controllers/nodeclaim/garbagecollection/controller.go +++ b/pkg/controllers/nodeclaim/garbagecollection/controller.go @@ -28,10 +28,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - corecontroller "github.com/aws/karpenter-core/pkg/operator/controller" - nodeclaimutil "github.com/aws/karpenter-core/pkg/utils/nodeclaim" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + operatorcontroller "sigs.k8s.io/karpenter/pkg/operator/controller" + nodeclaimutil "sigs.k8s.io/karpenter/pkg/utils/nodeclaim" ) type Controller struct { @@ -40,7 +40,7 @@ type Controller struct { cloudProvider cloudprovider.CloudProvider } -func NewController(c clock.Clock, kubeClient client.Client, cloudProvider cloudprovider.CloudProvider) corecontroller.Controller { +func NewController(c clock.Clock, kubeClient client.Client, cloudProvider cloudprovider.CloudProvider) operatorcontroller.Controller { return &Controller{ clock: c, kubeClient: kubeClient, @@ -95,6 +95,6 @@ func (c *Controller) Reconcile(ctx context.Context, _ reconcile.Request) (reconc return reconcile.Result{RequeueAfter: time.Minute * 2}, nil } -func (c *Controller) Builder(_ context.Context, m manager.Manager) corecontroller.Builder { - return corecontroller.NewSingletonManagedBy(m) +func (c *Controller) Builder(_ context.Context, m manager.Manager) operatorcontroller.Builder { + return operatorcontroller.NewSingletonManagedBy(m) } diff --git a/pkg/controllers/nodeclaim/garbagecollection/suite_test.go b/pkg/controllers/nodeclaim/garbagecollection/suite_test.go index 2572656bf..23eaeafb5 100644 --- a/pkg/controllers/nodeclaim/garbagecollection/suite_test.go +++ b/pkg/controllers/nodeclaim/garbagecollection/suite_test.go @@ -32,18 +32,18 @@ import ( "github.com/samber/lo" . "knative.dev/pkg/logging/testing" - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - nodeclaimgarbagecollection "github.com/aws/karpenter-core/pkg/controllers/nodeclaim/garbagecollection" - nodeclaimlifcycle "github.com/aws/karpenter-core/pkg/controllers/nodeclaim/lifecycle" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/options" - "github.com/aws/karpenter-core/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/test" - - . "github.com/aws/karpenter-core/pkg/test/expectations" + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + nodeclaimgarbagecollection "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/garbagecollection" + nodeclaimlifcycle "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/lifecycle" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/test" + + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var ctx context.Context diff --git a/pkg/controllers/nodeclaim/lifecycle/controller.go b/pkg/controllers/nodeclaim/lifecycle/controller.go index 3f8815e0e..498259c28 100644 --- a/pkg/controllers/nodeclaim/lifecycle/controller.go +++ b/pkg/controllers/nodeclaim/lifecycle/controller.go @@ -37,12 +37,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/events" - corecontroller "github.com/aws/karpenter-core/pkg/operator/controller" - nodeclaimutil "github.com/aws/karpenter-core/pkg/utils/nodeclaim" - "github.com/aws/karpenter-core/pkg/utils/result" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/events" + operatorcontroller "sigs.k8s.io/karpenter/pkg/operator/controller" + nodeclaimutil "sigs.k8s.io/karpenter/pkg/utils/nodeclaim" + "sigs.k8s.io/karpenter/pkg/utils/result" ) type nodeClaimReconciler interface { @@ -120,14 +120,14 @@ func (c *Controller) Reconcile(ctx context.Context, nodeClaim *v1beta1.NodeClaim return result.Min(results...), nil } -var _ corecontroller.TypedController[*v1beta1.NodeClaim] = (*NodeClaimController)(nil) +var _ operatorcontroller.TypedController[*v1beta1.NodeClaim] = (*NodeClaimController)(nil) type NodeClaimController struct { *Controller } -func NewNodeClaimController(clk clock.Clock, kubeClient client.Client, cloudProvider cloudprovider.CloudProvider, recorder events.Recorder) corecontroller.Controller { - return corecontroller.Typed[*v1beta1.NodeClaim](kubeClient, &NodeClaimController{ +func NewNodeClaimController(clk clock.Clock, kubeClient client.Client, cloudProvider cloudprovider.CloudProvider, recorder events.Recorder) operatorcontroller.Controller { + return operatorcontroller.Typed[*v1beta1.NodeClaim](kubeClient, &NodeClaimController{ Controller: NewController(clk, kubeClient, cloudProvider, recorder), }) } @@ -141,8 +141,8 @@ func (c *NodeClaimController) Reconcile(ctx context.Context, nodeClaim *v1beta1. return c.Controller.Reconcile(ctx, nodeClaim) } -func (c *NodeClaimController) Builder(_ context.Context, m manager.Manager) corecontroller.Builder { - return corecontroller.Adapt(controllerruntime. +func (c *NodeClaimController) Builder(_ context.Context, m manager.Manager) operatorcontroller.Builder { + return operatorcontroller.Adapt(controllerruntime. NewControllerManagedBy(m). For(&v1beta1.NodeClaim{}, builder.WithPredicates( predicate.Funcs{ diff --git a/pkg/controllers/nodeclaim/lifecycle/events.go b/pkg/controllers/nodeclaim/lifecycle/events.go index e94e6fecb..e234d2fcf 100644 --- a/pkg/controllers/nodeclaim/lifecycle/events.go +++ b/pkg/controllers/nodeclaim/lifecycle/events.go @@ -19,8 +19,8 @@ import ( v1 "k8s.io/api/core/v1" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/events" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/events" ) func InsufficientCapacityErrorEvent(nodeClaim *v1beta1.NodeClaim, err error) events.Event { diff --git a/pkg/controllers/nodeclaim/lifecycle/initialization.go b/pkg/controllers/nodeclaim/lifecycle/initialization.go index 2c76e4c0a..a03d26ce9 100644 --- a/pkg/controllers/nodeclaim/lifecycle/initialization.go +++ b/pkg/controllers/nodeclaim/lifecycle/initialization.go @@ -25,11 +25,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/scheduling" - nodeutil "github.com/aws/karpenter-core/pkg/utils/node" - nodeclaimutil "github.com/aws/karpenter-core/pkg/utils/nodeclaim" - "github.com/aws/karpenter-core/pkg/utils/resources" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/scheduling" + nodeutil "sigs.k8s.io/karpenter/pkg/utils/node" + nodeclaimutil "sigs.k8s.io/karpenter/pkg/utils/nodeclaim" + "sigs.k8s.io/karpenter/pkg/utils/resources" ) type Initialization struct { diff --git a/pkg/controllers/nodeclaim/lifecycle/initialization_test.go b/pkg/controllers/nodeclaim/lifecycle/initialization_test.go index 38e5e2578..eacdb3f6b 100644 --- a/pkg/controllers/nodeclaim/lifecycle/initialization_test.go +++ b/pkg/controllers/nodeclaim/lifecycle/initialization_test.go @@ -21,14 +21,14 @@ import ( cloudproviderapi "k8s.io/cloud-provider/api" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + "sigs.k8s.io/karpenter/pkg/test" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/aws/karpenter-core/pkg/test/expectations" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var _ = Describe("Initialization", func() { diff --git a/pkg/controllers/nodeclaim/lifecycle/launch.go b/pkg/controllers/nodeclaim/lifecycle/launch.go index 09664728c..0074a90b3 100644 --- a/pkg/controllers/nodeclaim/lifecycle/launch.go +++ b/pkg/controllers/nodeclaim/lifecycle/launch.go @@ -25,11 +25,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/scheduling" - nodeclaimutil "github.com/aws/karpenter-core/pkg/utils/nodeclaim" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/scheduling" + nodeclaimutil "sigs.k8s.io/karpenter/pkg/utils/nodeclaim" ) type Launch struct { diff --git a/pkg/controllers/nodeclaim/lifecycle/launch_test.go b/pkg/controllers/nodeclaim/lifecycle/launch_test.go index 2afff6c0a..e3fda7934 100644 --- a/pkg/controllers/nodeclaim/lifecycle/launch_test.go +++ b/pkg/controllers/nodeclaim/lifecycle/launch_test.go @@ -21,15 +21,15 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/test" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/aws/karpenter-core/pkg/test/expectations" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var _ = Describe("Launch", func() { diff --git a/pkg/controllers/nodeclaim/lifecycle/liveness.go b/pkg/controllers/nodeclaim/lifecycle/liveness.go index 88b6119d1..8aae64cab 100644 --- a/pkg/controllers/nodeclaim/lifecycle/liveness.go +++ b/pkg/controllers/nodeclaim/lifecycle/liveness.go @@ -23,8 +23,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - nodeclaimutil "github.com/aws/karpenter-core/pkg/utils/nodeclaim" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + nodeclaimutil "sigs.k8s.io/karpenter/pkg/utils/nodeclaim" ) type Liveness struct { diff --git a/pkg/controllers/nodeclaim/lifecycle/liveness_test.go b/pkg/controllers/nodeclaim/lifecycle/liveness_test.go index c544fe265..7cebd8d95 100644 --- a/pkg/controllers/nodeclaim/lifecycle/liveness_test.go +++ b/pkg/controllers/nodeclaim/lifecycle/liveness_test.go @@ -22,13 +22,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + "sigs.k8s.io/karpenter/pkg/test" . "github.com/onsi/ginkgo/v2" - . "github.com/aws/karpenter-core/pkg/test/expectations" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var _ = Describe("Liveness", func() { diff --git a/pkg/controllers/nodeclaim/lifecycle/registration.go b/pkg/controllers/nodeclaim/lifecycle/registration.go index 7b57c4be0..88f33f6e5 100644 --- a/pkg/controllers/nodeclaim/lifecycle/registration.go +++ b/pkg/controllers/nodeclaim/lifecycle/registration.go @@ -27,10 +27,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/metrics" - "github.com/aws/karpenter-core/pkg/scheduling" - nodeclaimutil "github.com/aws/karpenter-core/pkg/utils/nodeclaim" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/scheduling" + nodeclaimutil "sigs.k8s.io/karpenter/pkg/utils/nodeclaim" ) type Registration struct { diff --git a/pkg/controllers/nodeclaim/lifecycle/registration_test.go b/pkg/controllers/nodeclaim/lifecycle/registration_test.go index 8a15ad392..feadd956c 100644 --- a/pkg/controllers/nodeclaim/lifecycle/registration_test.go +++ b/pkg/controllers/nodeclaim/lifecycle/registration_test.go @@ -19,13 +19,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/test" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/aws/karpenter-core/pkg/test/expectations" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var _ = Describe("Registration", func() { diff --git a/pkg/controllers/nodeclaim/lifecycle/suite_test.go b/pkg/controllers/nodeclaim/lifecycle/suite_test.go index 3a89e34ea..afe2e6169 100644 --- a/pkg/controllers/nodeclaim/lifecycle/suite_test.go +++ b/pkg/controllers/nodeclaim/lifecycle/suite_test.go @@ -30,17 +30,17 @@ import ( "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - nodeclaimlifecycle "github.com/aws/karpenter-core/pkg/controllers/nodeclaim/lifecycle" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/options" - "github.com/aws/karpenter-core/pkg/operator/scheme" - . "github.com/aws/karpenter-core/pkg/test/expectations" - - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + nodeclaimlifecycle "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/lifecycle" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + . "sigs.k8s.io/karpenter/pkg/test/expectations" + + "sigs.k8s.io/karpenter/pkg/test" ) var ctx context.Context diff --git a/pkg/controllers/nodeclaim/termination/controller.go b/pkg/controllers/nodeclaim/termination/controller.go index fe7ac5487..8eca51b07 100644 --- a/pkg/controllers/nodeclaim/termination/controller.go +++ b/pkg/controllers/nodeclaim/termination/controller.go @@ -34,11 +34,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - corecontroller "github.com/aws/karpenter-core/pkg/operator/controller" - nodeclaimutil "github.com/aws/karpenter-core/pkg/utils/nodeclaim" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + operatorcontroller "sigs.k8s.io/karpenter/pkg/operator/controller" + nodeclaimutil "sigs.k8s.io/karpenter/pkg/utils/nodeclaim" ) // Controller is a NodeClaim Termination controller that triggers deletion of the Node and the @@ -99,14 +99,14 @@ func (c *Controller) Finalize(ctx context.Context, nodeClaim *v1beta1.NodeClaim) return reconcile.Result{}, nil } -var _ corecontroller.FinalizingTypedController[*v1beta1.NodeClaim] = (*NodeClaimController)(nil) +var _ operatorcontroller.FinalizingTypedController[*v1beta1.NodeClaim] = (*NodeClaimController)(nil) type NodeClaimController struct { *Controller } -func NewNodeClaimController(kubeClient client.Client, cloudProvider cloudprovider.CloudProvider) corecontroller.Controller { - return corecontroller.Typed[*v1beta1.NodeClaim](kubeClient, &NodeClaimController{ +func NewNodeClaimController(kubeClient client.Client, cloudProvider cloudprovider.CloudProvider) operatorcontroller.Controller { + return operatorcontroller.Typed[*v1beta1.NodeClaim](kubeClient, &NodeClaimController{ Controller: NewController(kubeClient, cloudProvider), }) } @@ -124,8 +124,8 @@ func (c *NodeClaimController) Finalize(ctx context.Context, nodeClaim *v1beta1.N return c.Controller.Finalize(ctx, nodeClaim) } -func (c *NodeClaimController) Builder(_ context.Context, m manager.Manager) corecontroller.Builder { - return corecontroller.Adapt(controllerruntime. +func (c *NodeClaimController) Builder(_ context.Context, m manager.Manager) operatorcontroller.Builder { + return operatorcontroller.Adapt(controllerruntime. NewControllerManagedBy(m). For(&v1beta1.NodeClaim{}). WithEventFilter(predicate.GenerationChangedPredicate{}). diff --git a/pkg/controllers/nodeclaim/termination/suite_test.go b/pkg/controllers/nodeclaim/termination/suite_test.go index 47b207eb5..563ff8969 100644 --- a/pkg/controllers/nodeclaim/termination/suite_test.go +++ b/pkg/controllers/nodeclaim/termination/suite_test.go @@ -31,19 +31,19 @@ import ( "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - nodeclaimlifecycle "github.com/aws/karpenter-core/pkg/controllers/nodeclaim/lifecycle" - nodeclaimtermination "github.com/aws/karpenter-core/pkg/controllers/nodeclaim/termination" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/options" - "github.com/aws/karpenter-core/pkg/operator/scheme" - . "github.com/aws/karpenter-core/pkg/test/expectations" - - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + nodeclaimlifecycle "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/lifecycle" + nodeclaimtermination "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/termination" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + . "sigs.k8s.io/karpenter/pkg/test/expectations" + + "sigs.k8s.io/karpenter/pkg/test" ) var ctx context.Context diff --git a/pkg/controllers/nodepool/counter/controller.go b/pkg/controllers/nodepool/counter/controller.go index bd6392c58..935601c8c 100644 --- a/pkg/controllers/nodepool/counter/controller.go +++ b/pkg/controllers/nodepool/counter/controller.go @@ -23,11 +23,11 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/handler" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/controllers/state" - corecontroller "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/utils/functional" - nodepoolutil "github.com/aws/karpenter-core/pkg/utils/nodepool" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/controllers/state" + operatorcontroller "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/utils/functional" + nodepoolutil "sigs.k8s.io/karpenter/pkg/utils/nodepool" v1 "k8s.io/api/core/v1" controllerruntime "sigs.k8s.io/controller-runtime" @@ -36,7 +36,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/utils/resources" + "sigs.k8s.io/karpenter/pkg/utils/resources" ) // Controller for the resource @@ -95,8 +95,8 @@ type NodePoolController struct { *Controller } -func NewNodePoolController(kubeClient client.Client, cluster *state.Cluster) corecontroller.Controller { - return corecontroller.Typed[*v1beta1.NodePool](kubeClient, &NodePoolController{ +func NewNodePoolController(kubeClient client.Client, cluster *state.Cluster) operatorcontroller.Controller { + return operatorcontroller.Typed[*v1beta1.NodePool](kubeClient, &NodePoolController{ Controller: NewController(kubeClient, cluster), }) } @@ -105,8 +105,8 @@ func (c *NodePoolController) Name() string { return "nodepool.counter" } -func (c *NodePoolController) Builder(_ context.Context, m manager.Manager) corecontroller.Builder { - return corecontroller.Adapt(controllerruntime. +func (c *NodePoolController) Builder(_ context.Context, m manager.Manager) operatorcontroller.Builder { + return operatorcontroller.Adapt(controllerruntime. NewControllerManagedBy(m). For(&v1beta1.NodePool{}). Watches( diff --git a/pkg/controllers/nodepool/counter/suite_test.go b/pkg/controllers/nodepool/counter/suite_test.go index 2f5111a73..b4c529f10 100644 --- a/pkg/controllers/nodepool/counter/suite_test.go +++ b/pkg/controllers/nodepool/counter/suite_test.go @@ -28,17 +28,17 @@ import ( . "knative.dev/pkg/logging/testing" "sigs.k8s.io/controller-runtime/pkg/client" - . "github.com/aws/karpenter-core/pkg/test/expectations" - - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - "github.com/aws/karpenter-core/pkg/controllers/nodepool/counter" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/controllers/state/informer" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/test" + . "sigs.k8s.io/karpenter/pkg/test/expectations" + + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + "sigs.k8s.io/karpenter/pkg/controllers/nodepool/counter" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/controllers/state/informer" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/test" ) var nodePoolController controller.Controller diff --git a/pkg/controllers/nodepool/hash/controller.go b/pkg/controllers/nodepool/hash/controller.go index 5e71f7a88..ae32d9025 100644 --- a/pkg/controllers/nodepool/hash/controller.go +++ b/pkg/controllers/nodepool/hash/controller.go @@ -26,9 +26,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - corecontroller "github.com/aws/karpenter-core/pkg/operator/controller" - nodepoolutil "github.com/aws/karpenter-core/pkg/utils/nodepool" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + operatorcontroller "sigs.k8s.io/karpenter/pkg/operator/controller" + nodepoolutil "sigs.k8s.io/karpenter/pkg/utils/nodepool" ) // Controller is hash controller that constructs a hash based on the fields that are considered for static drift. @@ -60,8 +60,8 @@ type NodePoolController struct { *Controller } -func NewNodePoolController(kubeClient client.Client) corecontroller.Controller { - return corecontroller.Typed[*v1beta1.NodePool](kubeClient, &NodePoolController{ +func NewNodePoolController(kubeClient client.Client) operatorcontroller.Controller { + return operatorcontroller.Typed[*v1beta1.NodePool](kubeClient, &NodePoolController{ Controller: NewController(kubeClient), }) } @@ -70,8 +70,8 @@ func (c *NodePoolController) Name() string { return "nodepool.hash" } -func (c *NodePoolController) Builder(_ context.Context, m manager.Manager) corecontroller.Builder { - return corecontroller.Adapt(controllerruntime. +func (c *NodePoolController) Builder(_ context.Context, m manager.Manager) operatorcontroller.Builder { + return operatorcontroller.Adapt(controllerruntime. NewControllerManagedBy(m). WithEventFilter(predicate.GenerationChangedPredicate{}). For(&v1beta1.NodePool{}). diff --git a/pkg/controllers/nodepool/hash/suite_test.go b/pkg/controllers/nodepool/hash/suite_test.go index f11166f53..4625b4f34 100644 --- a/pkg/controllers/nodepool/hash/suite_test.go +++ b/pkg/controllers/nodepool/hash/suite_test.go @@ -28,14 +28,14 @@ import ( "knative.dev/pkg/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - . "github.com/aws/karpenter-core/pkg/test/expectations" - - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/controllers/nodepool/hash" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/test" + . "sigs.k8s.io/karpenter/pkg/test/expectations" + + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/controllers/nodepool/hash" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/test" ) var nodePoolController controller.Controller diff --git a/pkg/controllers/provisioning/batcher.go b/pkg/controllers/provisioning/batcher.go index 67d80535d..b8d1e3c50 100644 --- a/pkg/controllers/provisioning/batcher.go +++ b/pkg/controllers/provisioning/batcher.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/aws/karpenter-core/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/operator/options" ) // Batcher separates a stream of Trigger() calls into windowed slices. The diff --git a/pkg/controllers/provisioning/controller.go b/pkg/controllers/provisioning/controller.go index 5e58d2d45..b0392a3bd 100644 --- a/pkg/controllers/provisioning/controller.go +++ b/pkg/controllers/provisioning/controller.go @@ -25,12 +25,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/events" - corecontroller "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/utils/pod" + "sigs.k8s.io/karpenter/pkg/events" + operatorcontroller "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/utils/pod" ) -var _ corecontroller.TypedController[*v1.Pod] = (*Controller)(nil) +var _ operatorcontroller.TypedController[*v1.Pod] = (*Controller)(nil) // Controller for the resource type Controller struct { @@ -40,8 +40,8 @@ type Controller struct { } // NewController constructs a controller instance -func NewController(kubeClient client.Client, provisioner *Provisioner, recorder events.Recorder) corecontroller.Controller { - return corecontroller.Typed[*v1.Pod](kubeClient, &Controller{ +func NewController(kubeClient client.Client, provisioner *Provisioner, recorder events.Recorder) operatorcontroller.Controller { + return operatorcontroller.Typed[*v1.Pod](kubeClient, &Controller{ kubeClient: kubeClient, provisioner: provisioner, recorder: recorder, @@ -65,8 +65,8 @@ func (c *Controller) Reconcile(_ context.Context, p *v1.Pod) (reconcile.Result, return reconcile.Result{RequeueAfter: 10 * time.Second}, nil } -func (c *Controller) Builder(_ context.Context, m manager.Manager) corecontroller.Builder { - return corecontroller.Adapt(controllerruntime. +func (c *Controller) Builder(_ context.Context, m manager.Manager) operatorcontroller.Builder { + return operatorcontroller.Adapt(controllerruntime. NewControllerManagedBy(m). For(&v1.Pod{}). WithOptions(controller.Options{MaxConcurrentReconciles: 10}), diff --git a/pkg/controllers/provisioning/metrics.go b/pkg/controllers/provisioning/metrics.go index af0d97ab7..9eafab29b 100644 --- a/pkg/controllers/provisioning/metrics.go +++ b/pkg/controllers/provisioning/metrics.go @@ -18,7 +18,7 @@ import ( "github.com/prometheus/client_golang/prometheus" crmetrics "sigs.k8s.io/controller-runtime/pkg/metrics" - "github.com/aws/karpenter-core/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/metrics" ) func init() { diff --git a/pkg/controllers/provisioning/provisioner.go b/pkg/controllers/provisioning/provisioner.go index 63734c9cf..873024ded 100644 --- a/pkg/controllers/provisioning/provisioner.go +++ b/pkg/controllers/provisioning/provisioner.go @@ -35,19 +35,19 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/scheduling" - "github.com/aws/karpenter-core/pkg/utils/functional" - nodepoolutil "github.com/aws/karpenter-core/pkg/utils/nodepool" - "github.com/aws/karpenter-core/pkg/utils/pretty" - - "github.com/aws/karpenter-core/pkg/cloudprovider" - scheduler "github.com/aws/karpenter-core/pkg/controllers/provisioning/scheduling" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/metrics" - "github.com/aws/karpenter-core/pkg/utils/pod" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/utils/functional" + nodepoolutil "sigs.k8s.io/karpenter/pkg/utils/nodepool" + "sigs.k8s.io/karpenter/pkg/utils/pretty" + + "sigs.k8s.io/karpenter/pkg/cloudprovider" + scheduler "sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/utils/pod" ) // LaunchOptions are the set of options that can be used to trigger certain diff --git a/pkg/controllers/provisioning/scheduling/events.go b/pkg/controllers/provisioning/scheduling/events.go index 6f7b5c2a6..29ac84862 100644 --- a/pkg/controllers/provisioning/scheduling/events.go +++ b/pkg/controllers/provisioning/scheduling/events.go @@ -22,8 +22,8 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/client-go/util/flowcontrol" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/events" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/events" ) // PodNominationRateLimiter is a pointer so it rate-limits across events diff --git a/pkg/controllers/provisioning/scheduling/existingnode.go b/pkg/controllers/provisioning/scheduling/existingnode.go index baaeba472..ecf31bbbf 100644 --- a/pkg/controllers/provisioning/scheduling/existingnode.go +++ b/pkg/controllers/provisioning/scheduling/existingnode.go @@ -21,9 +21,9 @@ import ( v1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/scheduling" - "github.com/aws/karpenter-core/pkg/utils/resources" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/utils/resources" ) type ExistingNode struct { diff --git a/pkg/controllers/provisioning/scheduling/instance_selection_test.go b/pkg/controllers/provisioning/scheduling/instance_selection_test.go index 125efe75a..1692e8984 100644 --- a/pkg/controllers/provisioning/scheduling/instance_selection_test.go +++ b/pkg/controllers/provisioning/scheduling/instance_selection_test.go @@ -25,12 +25,12 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/util/sets" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - "github.com/aws/karpenter-core/pkg/test" - . "github.com/aws/karpenter-core/pkg/test/expectations" - "github.com/aws/karpenter-core/pkg/utils/resources" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + "sigs.k8s.io/karpenter/pkg/test" + . "sigs.k8s.io/karpenter/pkg/test/expectations" + "sigs.k8s.io/karpenter/pkg/utils/resources" ) var _ = Describe("Instance Type Selection", func() { diff --git a/pkg/controllers/provisioning/scheduling/metrics.go b/pkg/controllers/provisioning/scheduling/metrics.go index fee2f61f3..8e98ccf2f 100644 --- a/pkg/controllers/provisioning/scheduling/metrics.go +++ b/pkg/controllers/provisioning/scheduling/metrics.go @@ -18,7 +18,7 @@ import ( "github.com/prometheus/client_golang/prometheus" crmetrics "sigs.k8s.io/controller-runtime/pkg/metrics" - "github.com/aws/karpenter-core/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/metrics" ) func init() { diff --git a/pkg/controllers/provisioning/scheduling/nodeclaim.go b/pkg/controllers/provisioning/scheduling/nodeclaim.go index 4c27f3861..1d8f27dbc 100644 --- a/pkg/controllers/provisioning/scheduling/nodeclaim.go +++ b/pkg/controllers/provisioning/scheduling/nodeclaim.go @@ -22,10 +22,10 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/scheduling" - "github.com/aws/karpenter-core/pkg/utils/resources" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/utils/resources" ) // NodeClaim is a set of constraints, compatible pods, and possible instance types that could fulfill these constraints. This diff --git a/pkg/controllers/provisioning/scheduling/nodeclaimtemplate.go b/pkg/controllers/provisioning/scheduling/nodeclaimtemplate.go index a99c1d441..57f6770f1 100644 --- a/pkg/controllers/provisioning/scheduling/nodeclaimtemplate.go +++ b/pkg/controllers/provisioning/scheduling/nodeclaimtemplate.go @@ -22,9 +22,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "knative.dev/pkg/ptr" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/scheduling" ) // NodeClaimTemplate encapsulates the fields required to create a node and mirrors diff --git a/pkg/controllers/provisioning/scheduling/preferences.go b/pkg/controllers/provisioning/scheduling/preferences.go index bd44a4128..05f6ab0a1 100644 --- a/pkg/controllers/provisioning/scheduling/preferences.go +++ b/pkg/controllers/provisioning/scheduling/preferences.go @@ -24,7 +24,7 @@ import ( "knative.dev/pkg/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/utils/pretty" + "sigs.k8s.io/karpenter/pkg/utils/pretty" ) type Preferences struct { diff --git a/pkg/controllers/provisioning/scheduling/queue.go b/pkg/controllers/provisioning/scheduling/queue.go index 6296fc70c..ffc7d23bd 100644 --- a/pkg/controllers/provisioning/scheduling/queue.go +++ b/pkg/controllers/provisioning/scheduling/queue.go @@ -20,7 +20,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - "github.com/aws/karpenter-core/pkg/utils/resources" + "sigs.k8s.io/karpenter/pkg/utils/resources" ) // Queue is a queue of pods that is scheduled. It's used to attempt to schedule pods as long as we are making progress diff --git a/pkg/controllers/provisioning/scheduling/scheduler.go b/pkg/controllers/provisioning/scheduling/scheduler.go index 89d785a88..d354073e2 100644 --- a/pkg/controllers/provisioning/scheduling/scheduler.go +++ b/pkg/controllers/provisioning/scheduling/scheduler.go @@ -27,15 +27,15 @@ import ( "knative.dev/pkg/logging" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/metrics" - "github.com/aws/karpenter-core/pkg/scheduling" - "github.com/aws/karpenter-core/pkg/utils/pod" - "github.com/aws/karpenter-core/pkg/utils/pretty" - "github.com/aws/karpenter-core/pkg/utils/resources" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/utils/pod" + "sigs.k8s.io/karpenter/pkg/utils/pretty" + "sigs.k8s.io/karpenter/pkg/utils/resources" ) // SchedulerOptions can be used to control the scheduling, these options are currently only used during consolidation. diff --git a/pkg/controllers/provisioning/scheduling/scheduling_benchmark_test.go b/pkg/controllers/provisioning/scheduling/scheduling_benchmark_test.go index 746f6d4d8..5f7f504b5 100644 --- a/pkg/controllers/provisioning/scheduling/scheduling_benchmark_test.go +++ b/pkg/controllers/provisioning/scheduling/scheduling_benchmark_test.go @@ -36,13 +36,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "knative.dev/pkg/logging" - "github.com/aws/karpenter-core/pkg/apis/settings" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - "github.com/aws/karpenter-core/pkg/controllers/provisioning/scheduling" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis/settings" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + "sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/test" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/controllers/provisioning/scheduling/suite_test.go b/pkg/controllers/provisioning/scheduling/suite_test.go index 862e136ca..fe4e059aa 100644 --- a/pkg/controllers/provisioning/scheduling/suite_test.go +++ b/pkg/controllers/provisioning/scheduling/suite_test.go @@ -36,27 +36,27 @@ import ( clock "k8s.io/utils/clock/testing" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - "github.com/aws/karpenter-core/pkg/controllers/provisioning" - "github.com/aws/karpenter-core/pkg/controllers/provisioning/scheduling" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/controllers/state/informer" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/options" - "github.com/aws/karpenter-core/pkg/operator/scheme" - pscheduling "github.com/aws/karpenter-core/pkg/scheduling" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + "sigs.k8s.io/karpenter/pkg/controllers/provisioning" + "sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/controllers/state/informer" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + pscheduling "sigs.k8s.io/karpenter/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/test" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "knative.dev/pkg/logging/testing" "knative.dev/pkg/ptr" - . "github.com/aws/karpenter-core/pkg/test/expectations" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var ctx context.Context diff --git a/pkg/controllers/provisioning/scheduling/topology.go b/pkg/controllers/provisioning/scheduling/topology.go index 32d3cc73c..ca156cd9a 100644 --- a/pkg/controllers/provisioning/scheduling/topology.go +++ b/pkg/controllers/provisioning/scheduling/topology.go @@ -19,9 +19,9 @@ import ( "fmt" "math" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/scheduling" - "github.com/aws/karpenter-core/pkg/utils/functional" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/utils/functional" "k8s.io/apimachinery/pkg/api/errors" @@ -34,7 +34,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/utils/pod" + "sigs.k8s.io/karpenter/pkg/utils/pod" ) type Topology struct { diff --git a/pkg/controllers/provisioning/scheduling/topology_test.go b/pkg/controllers/provisioning/scheduling/topology_test.go index 40a023095..254d1676b 100644 --- a/pkg/controllers/provisioning/scheduling/topology_test.go +++ b/pkg/controllers/provisioning/scheduling/topology_test.go @@ -27,10 +27,10 @@ import ( . "github.com/onsi/ginkgo/v2" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - "github.com/aws/karpenter-core/pkg/test" - . "github.com/aws/karpenter-core/pkg/test/expectations" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + "sigs.k8s.io/karpenter/pkg/test" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var _ = Describe("Topology", func() { diff --git a/pkg/controllers/provisioning/scheduling/topologygroup.go b/pkg/controllers/provisioning/scheduling/topologygroup.go index 73e8ab1b8..bdd941abd 100644 --- a/pkg/controllers/provisioning/scheduling/topologygroup.go +++ b/pkg/controllers/provisioning/scheduling/topologygroup.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" - "github.com/aws/karpenter-core/pkg/scheduling" - "github.com/aws/karpenter-core/pkg/utils/functional" + "sigs.k8s.io/karpenter/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/utils/functional" ) type TopologyType byte diff --git a/pkg/controllers/provisioning/scheduling/topologynodefilter.go b/pkg/controllers/provisioning/scheduling/topologynodefilter.go index 3e5db889c..f0a1d2380 100644 --- a/pkg/controllers/provisioning/scheduling/topologynodefilter.go +++ b/pkg/controllers/provisioning/scheduling/topologynodefilter.go @@ -17,8 +17,8 @@ package scheduling import ( v1 "k8s.io/api/core/v1" - "github.com/aws/karpenter-core/pkg/scheduling" - "github.com/aws/karpenter-core/pkg/utils/functional" + "sigs.k8s.io/karpenter/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/utils/functional" ) // TopologyNodeFilter is used to determine if a given actual node or scheduling node matches the pod's node selectors diff --git a/pkg/controllers/provisioning/scheduling/volumetopology.go b/pkg/controllers/provisioning/scheduling/volumetopology.go index 11d6986e6..35b8fbb18 100644 --- a/pkg/controllers/provisioning/scheduling/volumetopology.go +++ b/pkg/controllers/provisioning/scheduling/volumetopology.go @@ -26,7 +26,7 @@ import ( "knative.dev/pkg/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/scheduling" ) func NewVolumeTopology(kubeClient client.Client) *VolumeTopology { diff --git a/pkg/controllers/provisioning/suite_test.go b/pkg/controllers/provisioning/suite_test.go index a001d5482..d4c3b8b89 100644 --- a/pkg/controllers/provisioning/suite_test.go +++ b/pkg/controllers/provisioning/suite_test.go @@ -35,19 +35,19 @@ import ( "knative.dev/pkg/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - "github.com/aws/karpenter-core/pkg/controllers/provisioning" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/controllers/state/informer" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/options" - "github.com/aws/karpenter-core/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/test" - . "github.com/aws/karpenter-core/pkg/test/expectations" + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + "sigs.k8s.io/karpenter/pkg/controllers/provisioning" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/controllers/state/informer" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/test" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var ctx context.Context diff --git a/pkg/controllers/state/cluster.go b/pkg/controllers/state/cluster.go index d25ce6eff..a145fdb56 100644 --- a/pkg/controllers/state/cluster.go +++ b/pkg/controllers/state/cluster.go @@ -36,10 +36,10 @@ import ( "knative.dev/pkg/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/scheduling" - podutils "github.com/aws/karpenter-core/pkg/utils/pod" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/scheduling" + podutils "sigs.k8s.io/karpenter/pkg/utils/pod" ) // Cluster maintains cluster state that is often needed but expensive to compute. diff --git a/pkg/controllers/state/informer/daemonset.go b/pkg/controllers/state/informer/daemonset.go index 2f0c4f073..659373087 100644 --- a/pkg/controllers/state/informer/daemonset.go +++ b/pkg/controllers/state/informer/daemonset.go @@ -26,8 +26,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/controllers/state" - corecontroller "github.com/aws/karpenter-core/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/controllers/state" + operatorcontroller "sigs.k8s.io/karpenter/pkg/operator/controller" ) // Controller for the resource @@ -37,7 +37,7 @@ type Controller struct { } // NewController constructs a controller instance -func NewDaemonSetController(kubeClient client.Client, cluster *state.Cluster) corecontroller.Controller { +func NewDaemonSetController(kubeClient client.Client, cluster *state.Cluster) operatorcontroller.Controller { return &Controller{ kubeClient: kubeClient, cluster: cluster, @@ -64,8 +64,8 @@ func (c *Controller) Reconcile(ctx context.Context, req reconcile.Request) (reco return reconcile.Result{RequeueAfter: time.Minute}, nil } -func (c *Controller) Builder(_ context.Context, m manager.Manager) corecontroller.Builder { - return corecontroller.Adapt(controllerruntime. +func (c *Controller) Builder(_ context.Context, m manager.Manager) operatorcontroller.Builder { + return operatorcontroller.Adapt(controllerruntime. NewControllerManagedBy(m). For(&appsv1.DaemonSet{}). WithOptions(controller.Options{MaxConcurrentReconciles: 10}), diff --git a/pkg/controllers/state/informer/node.go b/pkg/controllers/state/informer/node.go index 80ea67dd6..989cb4867 100644 --- a/pkg/controllers/state/informer/node.go +++ b/pkg/controllers/state/informer/node.go @@ -26,8 +26,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/controllers/state" - corecontroller "github.com/aws/karpenter-core/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/controllers/state" + operatorcontroller "sigs.k8s.io/karpenter/pkg/operator/controller" ) // NodeController reconciles nodes for the purpose of maintaining state regarding nodes that is expensive to compute. @@ -37,7 +37,7 @@ type NodeController struct { } // NewNodeController constructs a controller instance -func NewNodeController(kubeClient client.Client, cluster *state.Cluster) corecontroller.Controller { +func NewNodeController(kubeClient client.Client, cluster *state.Cluster) operatorcontroller.Controller { return &NodeController{ kubeClient: kubeClient, cluster: cluster, @@ -65,8 +65,8 @@ func (c *NodeController) Reconcile(ctx context.Context, req reconcile.Request) ( return reconcile.Result{RequeueAfter: stateRetryPeriod}, nil } -func (c *NodeController) Builder(_ context.Context, m manager.Manager) corecontroller.Builder { - return corecontroller.Adapt(controllerruntime. +func (c *NodeController) Builder(_ context.Context, m manager.Manager) operatorcontroller.Builder { + return operatorcontroller.Adapt(controllerruntime. NewControllerManagedBy(m). For(&v1.Node{}). WithOptions(controller.Options{MaxConcurrentReconciles: 10})) diff --git a/pkg/controllers/state/informer/nodeclaim.go b/pkg/controllers/state/informer/nodeclaim.go index 0aa3be8fc..546c296cd 100644 --- a/pkg/controllers/state/informer/nodeclaim.go +++ b/pkg/controllers/state/informer/nodeclaim.go @@ -25,9 +25,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/controllers/state" - corecontroller "github.com/aws/karpenter-core/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/controllers/state" + operatorcontroller "sigs.k8s.io/karpenter/pkg/operator/controller" ) // NodeClaimController reconciles machine for the purpose of maintaining state. @@ -37,7 +37,7 @@ type NodeClaimController struct { } // NewNodeClaimController constructs a controller instance -func NewNodeClaimController(kubeClient client.Client, cluster *state.Cluster) corecontroller.Controller { +func NewNodeClaimController(kubeClient client.Client, cluster *state.Cluster) operatorcontroller.Controller { return &NodeClaimController{ kubeClient: kubeClient, cluster: cluster, @@ -63,8 +63,8 @@ func (c *NodeClaimController) Reconcile(ctx context.Context, req reconcile.Reque return reconcile.Result{RequeueAfter: stateRetryPeriod}, nil } -func (c *NodeClaimController) Builder(_ context.Context, m manager.Manager) corecontroller.Builder { - return corecontroller.Adapt(controllerruntime. +func (c *NodeClaimController) Builder(_ context.Context, m manager.Manager) operatorcontroller.Builder { + return operatorcontroller.Adapt(controllerruntime. NewControllerManagedBy(m). For(&v1beta1.NodeClaim{}). WithOptions(controller.Options{MaxConcurrentReconciles: 10})) diff --git a/pkg/controllers/state/informer/nodepool.go b/pkg/controllers/state/informer/nodepool.go index db2e4c715..6c3d94350 100644 --- a/pkg/controllers/state/informer/nodepool.go +++ b/pkg/controllers/state/informer/nodepool.go @@ -25,12 +25,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/controllers/state" - corecontroller "github.com/aws/karpenter-core/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/controllers/state" + operatorcontroller "sigs.k8s.io/karpenter/pkg/operator/controller" ) -var _ corecontroller.TypedController[*v1beta1.NodePool] = (*NodePoolController)(nil) +var _ operatorcontroller.TypedController[*v1beta1.NodePool] = (*NodePoolController)(nil) // NodePoolController reconciles NodePools to re-trigger consolidation on change. type NodePoolController struct { @@ -38,8 +38,8 @@ type NodePoolController struct { cluster *state.Cluster } -func NewNodePoolController(kubeClient client.Client, cluster *state.Cluster) corecontroller.Controller { - return corecontroller.Typed[*v1beta1.NodePool](kubeClient, &NodePoolController{ +func NewNodePoolController(kubeClient client.Client, cluster *state.Cluster) operatorcontroller.Controller { + return operatorcontroller.Typed[*v1beta1.NodePool](kubeClient, &NodePoolController{ kubeClient: kubeClient, cluster: cluster, }) @@ -55,8 +55,8 @@ func (c *NodePoolController) Reconcile(_ context.Context, _ *v1beta1.NodePool) ( return reconcile.Result{}, nil } -func (c *NodePoolController) Builder(_ context.Context, m manager.Manager) corecontroller.Builder { - return corecontroller.Adapt(controllerruntime. +func (c *NodePoolController) Builder(_ context.Context, m manager.Manager) operatorcontroller.Builder { + return operatorcontroller.Adapt(controllerruntime. NewControllerManagedBy(m). For(&v1beta1.NodePool{}). WithOptions(controller.Options{MaxConcurrentReconciles: 10}). diff --git a/pkg/controllers/state/informer/pod.go b/pkg/controllers/state/informer/pod.go index 4d5c3bedb..665069c6b 100644 --- a/pkg/controllers/state/informer/pod.go +++ b/pkg/controllers/state/informer/pod.go @@ -27,8 +27,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/controllers/state" - corecontroller "github.com/aws/karpenter-core/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/controllers/state" + operatorcontroller "sigs.k8s.io/karpenter/pkg/operator/controller" ) var stateRetryPeriod = 1 * time.Minute @@ -39,7 +39,7 @@ type PodController struct { cluster *state.Cluster } -func NewPodController(kubeClient client.Client, cluster *state.Cluster) corecontroller.Controller { +func NewPodController(kubeClient client.Client, cluster *state.Cluster) operatorcontroller.Controller { return &PodController{ kubeClient: kubeClient, cluster: cluster, @@ -70,8 +70,8 @@ func (c *PodController) Reconcile(ctx context.Context, req reconcile.Request) (r return reconcile.Result{RequeueAfter: stateRetryPeriod}, nil } -func (c *PodController) Builder(_ context.Context, m manager.Manager) corecontroller.Builder { - return corecontroller.Adapt(controllerruntime. +func (c *PodController) Builder(_ context.Context, m manager.Manager) operatorcontroller.Builder { + return operatorcontroller.Adapt(controllerruntime. NewControllerManagedBy(m). For(&v1.Pod{}). WithOptions(controller.Options{MaxConcurrentReconciles: 10})) diff --git a/pkg/controllers/state/statenode.go b/pkg/controllers/state/statenode.go index f89dec085..05ec15472 100644 --- a/pkg/controllers/state/statenode.go +++ b/pkg/controllers/state/statenode.go @@ -27,12 +27,12 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/operator/options" - "github.com/aws/karpenter-core/pkg/scheduling" - nodeutils "github.com/aws/karpenter-core/pkg/utils/node" - podutils "github.com/aws/karpenter-core/pkg/utils/pod" - "github.com/aws/karpenter-core/pkg/utils/resources" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/scheduling" + nodeutils "sigs.k8s.io/karpenter/pkg/utils/node" + podutils "sigs.k8s.io/karpenter/pkg/utils/pod" + "sigs.k8s.io/karpenter/pkg/utils/resources" ) //go:generate controller-gen object:headerFile="../../../hack/boilerplate.go.txt" paths="." diff --git a/pkg/controllers/state/suite_test.go b/pkg/controllers/state/suite_test.go index 29d43a1d9..8bb00fdc0 100644 --- a/pkg/controllers/state/suite_test.go +++ b/pkg/controllers/state/suite_test.go @@ -27,29 +27,29 @@ import ( clock "k8s.io/utils/clock/testing" "knative.dev/pkg/ptr" - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider/fake" - "github.com/aws/karpenter-core/pkg/controllers/state/informer" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/options" - "github.com/aws/karpenter-core/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider/fake" + "sigs.k8s.io/karpenter/pkg/controllers/state/informer" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/scheduling" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/test" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "knative.dev/pkg/logging/testing" - . "github.com/aws/karpenter-core/pkg/test/expectations" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var ctx context.Context diff --git a/pkg/controllers/state/zz_generated.deepcopy.go b/pkg/controllers/state/zz_generated.deepcopy.go index 3fc67b006..0406cd6cd 100644 --- a/pkg/controllers/state/zz_generated.deepcopy.go +++ b/pkg/controllers/state/zz_generated.deepcopy.go @@ -19,11 +19,11 @@ limitations under the License. package state import ( - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/scheduling" "k8s.io/api/core/v1" resource "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/scheduling" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/pkg/events/suite_test.go b/pkg/events/suite_test.go index 748d3ee97..6730584fe 100644 --- a/pkg/events/suite_test.go +++ b/pkg/events/suite_test.go @@ -27,11 +27,11 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/client-go/util/flowcontrol" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - terminatorevents "github.com/aws/karpenter-core/pkg/controllers/node/termination/terminator/events" - schedulingevents "github.com/aws/karpenter-core/pkg/controllers/provisioning/scheduling" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + terminatorevents "sigs.k8s.io/karpenter/pkg/controllers/node/termination/terminator/events" + schedulingevents "sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/test" ) var eventRecorder events.Recorder diff --git a/pkg/metrics/suite_test.go b/pkg/metrics/suite_test.go index c091ff97d..21f169d55 100644 --- a/pkg/metrics/suite_test.go +++ b/pkg/metrics/suite_test.go @@ -24,8 +24,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" crmetrics "sigs.k8s.io/controller-runtime/pkg/metrics" - "github.com/aws/karpenter-core/pkg/metrics" - . "github.com/aws/karpenter-core/pkg/test/expectations" + "sigs.k8s.io/karpenter/pkg/metrics" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var testGauge1, testGauge2 *prometheus.GaugeVec diff --git a/pkg/operator/controller/singleton.go b/pkg/operator/controller/singleton.go index c2622494e..dffb0cef2 100644 --- a/pkg/operator/controller/singleton.go +++ b/pkg/operator/controller/singleton.go @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/ratelimiter" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/metrics" ) const ( diff --git a/pkg/operator/controller/suite_test.go b/pkg/operator/controller/suite_test.go index fa9900bfc..c1015a00b 100644 --- a/pkg/operator/controller/suite_test.go +++ b/pkg/operator/controller/suite_test.go @@ -26,17 +26,17 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/test" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "knative.dev/pkg/logging/testing" - . "github.com/aws/karpenter-core/pkg/test/expectations" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var ctx context.Context diff --git a/pkg/operator/controller/typed.go b/pkg/operator/controller/typed.go index 68ff06a7a..9688e0fea 100644 --- a/pkg/operator/controller/typed.go +++ b/pkg/operator/controller/typed.go @@ -26,8 +26,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/operator/injection" - "github.com/aws/karpenter-core/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/operator/injection" + "sigs.k8s.io/karpenter/pkg/operator/scheme" ) type TypedController[T client.Object] interface { diff --git a/pkg/operator/injection/fake/settings.go b/pkg/operator/injection/fake/settings.go index 416620670..c79dcbd86 100644 --- a/pkg/operator/injection/fake/settings.go +++ b/pkg/operator/injection/fake/settings.go @@ -21,7 +21,7 @@ import ( v1 "k8s.io/api/core/v1" "knative.dev/pkg/configmap" - "github.com/aws/karpenter-core/pkg/apis/settings" + "sigs.k8s.io/karpenter/pkg/apis/settings" ) type settingsKeyType struct{} diff --git a/pkg/operator/injection/injection.go b/pkg/operator/injection/injection.go index 47f6e472d..f4538220b 100644 --- a/pkg/operator/injection/injection.go +++ b/pkg/operator/injection/injection.go @@ -32,8 +32,8 @@ import ( "knative.dev/pkg/system" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/apis/settings" - "github.com/aws/karpenter-core/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/apis/settings" + "sigs.k8s.io/karpenter/pkg/operator/options" ) type controllerNameKeyType struct{} diff --git a/pkg/operator/injection/suite_test.go b/pkg/operator/injection/suite_test.go index 8f79557a5..4c39f32bf 100644 --- a/pkg/operator/injection/suite_test.go +++ b/pkg/operator/injection/suite_test.go @@ -23,17 +23,17 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "knative.dev/pkg/system" - "github.com/aws/karpenter-core/pkg/apis/settings" - "github.com/aws/karpenter-core/pkg/operator/injection" - "github.com/aws/karpenter-core/pkg/operator/injection/fake" - "github.com/aws/karpenter-core/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis/settings" + "sigs.k8s.io/karpenter/pkg/operator/injection" + "sigs.k8s.io/karpenter/pkg/operator/injection/fake" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/test" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "knative.dev/pkg/logging/testing" - . "github.com/aws/karpenter-core/pkg/test/expectations" + . "sigs.k8s.io/karpenter/pkg/test/expectations" ) var ctx context.Context diff --git a/pkg/operator/logging/logging.go b/pkg/operator/logging/logging.go index 425571ee1..4db4d11f0 100644 --- a/pkg/operator/logging/logging.go +++ b/pkg/operator/logging/logging.go @@ -41,8 +41,8 @@ import ( ctrl "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/aws/karpenter-core/pkg/operator/injection" - "github.com/aws/karpenter-core/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/operator/injection" + "sigs.k8s.io/karpenter/pkg/operator/options" ) const ( diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go index 31ac01693..ffa76ec57 100644 --- a/pkg/operator/operator.go +++ b/pkg/operator/operator.go @@ -45,15 +45,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/metrics/server" - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/events" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/injection" - "github.com/aws/karpenter-core/pkg/operator/logging" - "github.com/aws/karpenter-core/pkg/operator/options" - "github.com/aws/karpenter-core/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/webhooks" + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/events" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/injection" + "sigs.k8s.io/karpenter/pkg/operator/logging" + "sigs.k8s.io/karpenter/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/webhooks" ) const ( diff --git a/pkg/operator/options/options.go b/pkg/operator/options/options.go index 32705f9ea..711f5c319 100644 --- a/pkg/operator/options/options.go +++ b/pkg/operator/options/options.go @@ -26,8 +26,8 @@ import ( "github.com/samber/lo" cliflag "k8s.io/component-base/cli/flag" - "github.com/aws/karpenter-core/pkg/apis/settings" - "github.com/aws/karpenter-core/pkg/utils/env" + "sigs.k8s.io/karpenter/pkg/apis/settings" + "sigs.k8s.io/karpenter/pkg/utils/env" ) var ( diff --git a/pkg/operator/options/suite_test.go b/pkg/operator/options/suite_test.go index c969f04e0..295775376 100644 --- a/pkg/operator/options/suite_test.go +++ b/pkg/operator/options/suite_test.go @@ -26,9 +26,9 @@ import ( "github.com/samber/lo" . "knative.dev/pkg/logging/testing" - "github.com/aws/karpenter-core/pkg/apis/settings" - "github.com/aws/karpenter-core/pkg/operator/options" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis/settings" + "sigs.k8s.io/karpenter/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/test" ) var ctx context.Context diff --git a/pkg/operator/scheme/scheme.go b/pkg/operator/scheme/scheme.go index aa84fce5e..49498948a 100644 --- a/pkg/operator/scheme/scheme.go +++ b/pkg/operator/scheme/scheme.go @@ -20,7 +20,7 @@ import ( "github.com/samber/lo" - "github.com/aws/karpenter-core/pkg/apis" + "sigs.k8s.io/karpenter/pkg/apis" ) var ( diff --git a/pkg/scheduling/requirement.go b/pkg/scheduling/requirement.go index 1f2bbef49..824e7fc8a 100644 --- a/pkg/scheduling/requirement.go +++ b/pkg/scheduling/requirement.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/sets" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" ) // Requirement is an efficient represenatation of v1.NodeSelectorRequirement diff --git a/pkg/scheduling/requirements.go b/pkg/scheduling/requirements.go index ea9160bdf..3bb02c89e 100644 --- a/pkg/scheduling/requirements.go +++ b/pkg/scheduling/requirements.go @@ -25,9 +25,9 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/sets" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/utils/functional" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/utils/functional" ) // Requirements are an efficient set representation under the hood. Since its underlying diff --git a/pkg/scheduling/storageclass.go b/pkg/scheduling/storageclass.go index 0f68c0ed4..ea8dae6a3 100644 --- a/pkg/scheduling/storageclass.go +++ b/pkg/scheduling/storageclass.go @@ -23,7 +23,7 @@ import ( storagev1 "k8s.io/api/storage/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/utils/atomic" + "sigs.k8s.io/karpenter/pkg/utils/atomic" ) const IsDefaultStorageClassAnnotation = "storageclass.kubernetes.io/is-default-class" diff --git a/pkg/test/environment.go b/pkg/test/environment.go index 522072f32..e401e2a30 100644 --- a/pkg/test/environment.go +++ b/pkg/test/environment.go @@ -31,9 +31,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/utils/env" - "github.com/aws/karpenter-core/pkg/utils/functional" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/utils/env" + "sigs.k8s.io/karpenter/pkg/utils/functional" ) type Environment struct { diff --git a/pkg/test/eventrecorder.go b/pkg/test/eventrecorder.go index 465208ad7..b823dadab 100644 --- a/pkg/test/eventrecorder.go +++ b/pkg/test/eventrecorder.go @@ -19,7 +19,7 @@ import ( "github.com/samber/lo" - "github.com/aws/karpenter-core/pkg/events" + "sigs.k8s.io/karpenter/pkg/events" ) var _ events.Recorder = (*EventRecorder)(nil) diff --git a/pkg/test/expectations/expectations.go b/pkg/test/expectations/expectations.go index 8a712d46d..97194aa07 100644 --- a/pkg/test/expectations/expectations.go +++ b/pkg/test/expectations/expectations.go @@ -46,17 +46,17 @@ import ( crmetrics "sigs.k8s.io/controller-runtime/pkg/metrics" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/cloudprovider" - "github.com/aws/karpenter-core/pkg/controllers/nodeclaim/lifecycle" - "github.com/aws/karpenter-core/pkg/controllers/provisioning" - "github.com/aws/karpenter-core/pkg/controllers/provisioning/scheduling" - "github.com/aws/karpenter-core/pkg/controllers/state" - "github.com/aws/karpenter-core/pkg/metrics" - "github.com/aws/karpenter-core/pkg/operator/controller" - "github.com/aws/karpenter-core/pkg/operator/scheme" - pscheduling "github.com/aws/karpenter-core/pkg/scheduling" - "github.com/aws/karpenter-core/pkg/test" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/cloudprovider" + "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/lifecycle" + "sigs.k8s.io/karpenter/pkg/controllers/provisioning" + "sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling" + "sigs.k8s.io/karpenter/pkg/controllers/state" + "sigs.k8s.io/karpenter/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/operator/controller" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + pscheduling "sigs.k8s.io/karpenter/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/test" ) const ( diff --git a/pkg/test/machine.go b/pkg/test/machine.go index 9bfc5cca3..14f7c1bb7 100644 --- a/pkg/test/machine.go +++ b/pkg/test/machine.go @@ -20,7 +20,7 @@ import ( "github.com/imdario/mergo" v1 "k8s.io/api/core/v1" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" ) // Machine creates a test machine with defaults that can be overridden by MachineOptions. diff --git a/pkg/test/metadata.go b/pkg/test/metadata.go index d5d9dbcfd..e8f662534 100644 --- a/pkg/test/metadata.go +++ b/pkg/test/metadata.go @@ -25,7 +25,7 @@ import ( "github.com/imdario/mergo" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" ) const DiscoveryLabel = "testing/cluster" diff --git a/pkg/test/nodeclaim.go b/pkg/test/nodeclaim.go index 87c0e6eb1..0d7c008ca 100644 --- a/pkg/test/nodeclaim.go +++ b/pkg/test/nodeclaim.go @@ -20,7 +20,7 @@ import ( "github.com/imdario/mergo" v1 "k8s.io/api/core/v1" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" ) // NodeClaim creates a test NodeClaim with defaults that can be overridden by overrides. diff --git a/pkg/test/nodepool.go b/pkg/test/nodepool.go index 9d388de15..09c100efd 100644 --- a/pkg/test/nodepool.go +++ b/pkg/test/nodepool.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/util/sets" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" ) // NodePool creates a test NodePool with defaults that can be overridden by overrides. diff --git a/pkg/test/nodes.go b/pkg/test/nodes.go index f286273f2..055bab084 100644 --- a/pkg/test/nodes.go +++ b/pkg/test/nodes.go @@ -21,8 +21,8 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" ) type NodeOptions struct { diff --git a/pkg/test/options.go b/pkg/test/options.go index f0375d57c..2da3f0deb 100644 --- a/pkg/test/options.go +++ b/pkg/test/options.go @@ -21,7 +21,7 @@ import ( "github.com/imdario/mergo" "github.com/samber/lo" - "github.com/aws/karpenter-core/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/operator/options" ) type OptionsFields struct { diff --git a/pkg/test/provisioner.go b/pkg/test/provisioner.go index 63f1b4750..3f2958b86 100644 --- a/pkg/test/provisioner.go +++ b/pkg/test/provisioner.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" ) // ProvisionerOptions customizes a Provisioner. diff --git a/pkg/test/settings.go b/pkg/test/settings.go index 11b7cc0b0..28cd0d283 100644 --- a/pkg/test/settings.go +++ b/pkg/test/settings.go @@ -20,7 +20,7 @@ import ( "github.com/imdario/mergo" - "github.com/aws/karpenter-core/pkg/apis/settings" + "sigs.k8s.io/karpenter/pkg/apis/settings" ) func Settings(overrides ...settings.Settings) *settings.Settings { diff --git a/pkg/utils/atomic/lazy.go b/pkg/utils/atomic/lazy.go index b2f2e58f6..4a28bd245 100644 --- a/pkg/utils/atomic/lazy.go +++ b/pkg/utils/atomic/lazy.go @@ -20,7 +20,7 @@ import ( "github.com/samber/lo" - "github.com/aws/karpenter-core/pkg/utils/functional" + "sigs.k8s.io/karpenter/pkg/utils/functional" ) type Options struct { diff --git a/pkg/utils/atomic/suite_test.go b/pkg/utils/atomic/suite_test.go index 825ca06d3..f8d027f09 100644 --- a/pkg/utils/atomic/suite_test.go +++ b/pkg/utils/atomic/suite_test.go @@ -23,7 +23,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/aws/karpenter-core/pkg/utils/atomic" + "sigs.k8s.io/karpenter/pkg/utils/atomic" ) func TestAtomic(t *testing.T) { diff --git a/pkg/utils/node/node.go b/pkg/utils/node/node.go index f0d184ffc..f621c5a06 100644 --- a/pkg/utils/node/node.go +++ b/pkg/utils/node/node.go @@ -21,7 +21,7 @@ import ( v1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/aws/karpenter-core/pkg/utils/pod" + "sigs.k8s.io/karpenter/pkg/utils/pod" ) // GetNodePods gets the list of schedulable pods from a variadic list of nodes diff --git a/pkg/utils/nodeclaim/nodeclaim.go b/pkg/utils/nodeclaim/nodeclaim.go index c29c3ee25..64aefffe1 100644 --- a/pkg/utils/nodeclaim/nodeclaim.go +++ b/pkg/utils/nodeclaim/nodeclaim.go @@ -29,9 +29,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/metrics" - "github.com/aws/karpenter-core/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/metrics" + "sigs.k8s.io/karpenter/pkg/scheduling" ) // PodEventHandler is a watcher on v1.Pods that maps Pods to NodeClaim based on the node names diff --git a/pkg/utils/nodeclaim/suite_test.go b/pkg/utils/nodeclaim/suite_test.go index fff7ef759..10464b68f 100644 --- a/pkg/utils/nodeclaim/suite_test.go +++ b/pkg/utils/nodeclaim/suite_test.go @@ -29,15 +29,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/apiutil" - "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/operator/scheme" - . "github.com/aws/karpenter-core/pkg/test/expectations" - - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/scheduling" - "github.com/aws/karpenter-core/pkg/test" - nodeclaimutil "github.com/aws/karpenter-core/pkg/utils/nodeclaim" + "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + . "sigs.k8s.io/karpenter/pkg/test/expectations" + + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/test" + nodeclaimutil "sigs.k8s.io/karpenter/pkg/utils/nodeclaim" ) var ctx context.Context diff --git a/pkg/utils/nodepool/nodepool.go b/pkg/utils/nodepool/nodepool.go index 45cb73605..05a80aa0d 100644 --- a/pkg/utils/nodepool/nodepool.go +++ b/pkg/utils/nodepool/nodepool.go @@ -24,8 +24,8 @@ import ( "github.com/samber/lo" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" ) func New(provisioner *v1alpha5.Provisioner) *v1beta1.NodePool { diff --git a/pkg/utils/nodepool/suite_test.go b/pkg/utils/nodepool/suite_test.go index c547ba2b4..5f0df194a 100644 --- a/pkg/utils/nodepool/suite_test.go +++ b/pkg/utils/nodepool/suite_test.go @@ -31,13 +31,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - coreapis "github.com/aws/karpenter-core/pkg/apis" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/operator/scheme" - "github.com/aws/karpenter-core/pkg/test" - . "github.com/aws/karpenter-core/pkg/test/expectations" - nodepoolutil "github.com/aws/karpenter-core/pkg/utils/nodepool" + karpenterapis "sigs.k8s.io/karpenter/pkg/apis" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/operator/scheme" + "sigs.k8s.io/karpenter/pkg/test" + . "sigs.k8s.io/karpenter/pkg/test/expectations" + nodepoolutil "sigs.k8s.io/karpenter/pkg/utils/nodepool" ) var ctx context.Context @@ -50,7 +50,7 @@ func TestAPIs(t *testing.T) { } var _ = BeforeSuite(func() { - env = test.NewEnvironment(scheme.Scheme, test.WithCRDs(coreapis.CRDs...)) + env = test.NewEnvironment(scheme.Scheme, test.WithCRDs(karpenterapis.CRDs...)) }) var _ = AfterSuite(func() { diff --git a/pkg/utils/pod/scheduling.go b/pkg/utils/pod/scheduling.go index e88da99ca..fcaeb0243 100644 --- a/pkg/utils/pod/scheduling.go +++ b/pkg/utils/pod/scheduling.go @@ -18,9 +18,9 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/scheduling" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/scheduling" ) func IsProvisionable(pod *v1.Pod) bool { diff --git a/pkg/utils/resources/resources.go b/pkg/utils/resources/resources.go index e5f97db1e..d5f23a287 100644 --- a/pkg/utils/resources/resources.go +++ b/pkg/utils/resources/resources.go @@ -18,7 +18,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "github.com/aws/karpenter-core/pkg/utils/pretty" + "sigs.k8s.io/karpenter/pkg/utils/pretty" ) // RequestsForPods returns the total resources of a variadic list of podspecs. diff --git a/pkg/webhooks/webhooks.go b/pkg/webhooks/webhooks.go index b513d1b8b..6e77a11c8 100644 --- a/pkg/webhooks/webhooks.go +++ b/pkg/webhooks/webhooks.go @@ -41,10 +41,10 @@ import ( "knative.dev/pkg/webhook/resourcesemantics/validation" "sigs.k8s.io/controller-runtime/pkg/healthz" - "github.com/aws/karpenter-core/pkg/apis/v1alpha5" - "github.com/aws/karpenter-core/pkg/apis/v1beta1" - "github.com/aws/karpenter-core/pkg/operator/logging" - "github.com/aws/karpenter-core/pkg/operator/options" + "sigs.k8s.io/karpenter/pkg/apis/v1alpha5" + "sigs.k8s.io/karpenter/pkg/apis/v1beta1" + "sigs.k8s.io/karpenter/pkg/operator/logging" + "sigs.k8s.io/karpenter/pkg/operator/options" ) const component = "webhook"