diff --git a/pkg/cliplugins/workload/plugin/sync.go b/pkg/cliplugins/workload/plugin/sync.go index e0886661414..ad815ee144e 100644 --- a/pkg/cliplugins/workload/plugin/sync.go +++ b/pkg/cliplugins/workload/plugin/sync.go @@ -37,7 +37,6 @@ import ( "github.com/kcp-dev/logicalcluster/v3" "github.com/martinlindhe/base36" "github.com/spf13/cobra" - "k8s.io/apimachinery/pkg/util/sets" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" @@ -47,6 +46,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" utilerrors "k8s.io/apimachinery/pkg/util/errors" + "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/cli-runtime/pkg/genericclioptions" diff --git a/pkg/reconciler/scheduling/placement/placement_reconcile_scheduling.go b/pkg/reconciler/scheduling/placement/placement_reconcile_scheduling.go index 17c88dd3ba5..bc46fb0d91b 100644 --- a/pkg/reconciler/scheduling/placement/placement_reconcile_scheduling.go +++ b/pkg/reconciler/scheduling/placement/placement_reconcile_scheduling.go @@ -21,10 +21,10 @@ import ( "math/rand" "github.com/kcp-dev/logicalcluster/v3" - "k8s.io/apimachinery/pkg/util/sets" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/util/sets" schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" diff --git a/pkg/reconciler/topology/partitionset/partitionset_reconcile.go b/pkg/reconciler/topology/partitionset/partitionset_reconcile.go index 796521092b7..e8abc14793a 100644 --- a/pkg/reconciler/topology/partitionset/partitionset_reconcile.go +++ b/pkg/reconciler/topology/partitionset/partitionset_reconcile.go @@ -21,12 +21,12 @@ import ( "sort" "github.com/kcp-dev/logicalcluster/v3" - "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/api/equality" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" "github.com/kcp-dev/kcp/pkg/logging" diff --git a/pkg/reconciler/workload/namespace/namespace_controller.go b/pkg/reconciler/workload/namespace/namespace_controller.go index c44155233b2..e48ecdf77c4 100644 --- a/pkg/reconciler/workload/namespace/namespace_controller.go +++ b/pkg/reconciler/workload/namespace/namespace_controller.go @@ -25,13 +25,13 @@ import ( kcpcorev1informers "github.com/kcp-dev/client-go/informers/core/v1" kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" "github.com/kcp-dev/logicalcluster/v3" - "k8s.io/apimachinery/pkg/util/sets" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/runtime" + "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/tools/cache" diff --git a/pkg/reconciler/workload/replicateclusterrole/replicateclusterrole_controller.go b/pkg/reconciler/workload/replicateclusterrole/replicateclusterrole_controller.go index 126be7d3003..ddef5687c34 100644 --- a/pkg/reconciler/workload/replicateclusterrole/replicateclusterrole_controller.go +++ b/pkg/reconciler/workload/replicateclusterrole/replicateclusterrole_controller.go @@ -20,9 +20,9 @@ import ( kcprbacinformers "github.com/kcp-dev/client-go/informers/rbac/v1" kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" "github.com/kcp-dev/logicalcluster/v3" - "k8s.io/apimachinery/pkg/util/sets" rbacv1 "k8s.io/api/rbac/v1" + "k8s.io/apimachinery/pkg/util/sets" "github.com/kcp-dev/kcp/pkg/reconciler/cache/labelclusterroles" "github.com/kcp-dev/kcp/sdk/apis/workload" diff --git a/pkg/reconciler/workload/resource/resource_reconcile_test.go b/pkg/reconciler/workload/resource/resource_reconcile_test.go index 1110be4a83a..6cb16778716 100644 --- a/pkg/reconciler/workload/resource/resource_reconcile_test.go +++ b/pkg/reconciler/workload/resource/resource_reconcile_test.go @@ -22,10 +22,10 @@ import ( "time" "github.com/google/go-cmp/cmp" - "k8s.io/apimachinery/pkg/util/sets" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" ) diff --git a/pkg/server/options/flags_test.go b/pkg/server/options/flags_test.go index 6728be4584e..bee69ba7ccd 100644 --- a/pkg/server/options/flags_test.go +++ b/pkg/server/options/flags_test.go @@ -22,6 +22,7 @@ import ( "testing" "github.com/spf13/pflag" + "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/pkg/syncer/shared/helpers.go b/pkg/syncer/shared/helpers.go index 0bed070d010..bb7187675ce 100644 --- a/pkg/syncer/shared/helpers.go +++ b/pkg/syncer/shared/helpers.go @@ -25,10 +25,10 @@ import ( "github.com/kcp-dev/logicalcluster/v3" "github.com/martinlindhe/base36" - "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/sets" workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) diff --git a/pkg/syncer/upsync/upsync_process_test.go b/pkg/syncer/upsync/upsync_process_test.go index c13ad786a92..dd9a5b977ed 100644 --- a/pkg/syncer/upsync/upsync_process_test.go +++ b/pkg/syncer/upsync/upsync_process_test.go @@ -27,7 +27,6 @@ import ( "github.com/kcp-dev/logicalcluster/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "k8s.io/apimachinery/pkg/util/sets" kcpfakedynamic "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/dynamic/fake" kcptesting "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/testing" @@ -38,6 +37,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/dynamic"