improve import sorting

On-behalf-of: @SAP [email protected]

Author: xrstf

.gimps.yaml

@@ -19,9 +19,14 @@ sets:
   - name: kubernetes
     patterns:
       - 'k8s.io/**'
-      - '*.k8s.io/**'
+      - 'sigs.k8s.io/controller-runtime/**'
+      - 'sigs.k8s.io/controller-tools/**'
+      - 'sigs.k8s.io/yaml/**'
       - 'github.com/kcp-dev/client-go/**'
       - 'github.com/kcp-dev/kubernetes/**'
   - name: kcp
     patterns:
       - 'github.com/kcp-dev/kcp/**'
+      - 'github.com/kcp-dev/multicluster-provider/**'
+      - 'github.com/kcp-dev/code-generator/**'
+      - 'sigs.k8s.io/multicluster-runtime/**'

hack/tools.go

@@ -19,10 +19,11 @@ limitations under the License.
 package tools
 
 import (
-	_ "github.com/kcp-dev/code-generator/v2"
 	_ "github.com/openshift-eng/openshift-goimports"
 	_ "k8c.io/reconciler/cmd/reconciler-gen"
 
+	_ "github.com/kcp-dev/code-generator/v2"
+
 	_ "k8s.io/code-generator/cmd/applyconfiguration-gen"
 	_ "k8s.io/code-generator/cmd/client-gen"
 	_ "sigs.k8s.io/controller-tools/cmd/controller-gen"

internal/controller/sync/controller.go

@@ -32,6 +32,11 @@ import (
 
 	kcpcore "github.com/kcp-dev/kcp/sdk/apis/core"
 	kcpdevcorev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
+	mccontroller "sigs.k8s.io/multicluster-runtime/pkg/controller"
+	mchandler "sigs.k8s.io/multicluster-runtime/pkg/handler"
+	mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
+	mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
+	mcsource "sigs.k8s.io/multicluster-runtime/pkg/source"
 
 	corev1 "k8s.io/api/core/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -46,11 +51,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
-	mccontroller "sigs.k8s.io/multicluster-runtime/pkg/controller"
-	mchandler "sigs.k8s.io/multicluster-runtime/pkg/handler"
-	mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
-	mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
-	mcsource "sigs.k8s.io/multicluster-runtime/pkg/source"
 )
 
 const (

internal/controller/syncmanager/controller.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"fmt"
 
-	apiexportprovider "github.com/kcp-dev/multicluster-provider/apiexport"
 	"go.uber.org/zap"
 
 	"github.com/kcp-dev/api-syncagent/internal/controller/sync"
@@ -31,6 +30,9 @@ import (
 
 	kcpapisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
 	kcpdevv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
+	apiexportprovider "github.com/kcp-dev/multicluster-provider/apiexport"
+	mccontroller "sigs.k8s.io/multicluster-runtime/pkg/controller"
+	mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/labels"
@@ -47,8 +49,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
-	mccontroller "sigs.k8s.io/multicluster-runtime/pkg/controller"
-	mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
 )
 
 const (

internal/sync/metadata.go

@@ -21,14 +21,15 @@ import (
 	"maps"
 	"strings"
 
+	mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"
 	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
 )
 
 func stripMetadata(obj *unstructured.Unstructured) error {

test/utils/utils.go

@@ -23,12 +23,11 @@ import (
 	"regexp"
 	"testing"
 
-	mcclient "github.com/kcp-dev/multicluster-provider/client"
-
 	syncagentv1alpha1 "github.com/kcp-dev/api-syncagent/sdk/apis/syncagent/v1alpha1"
 
 	kcpapisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
 	kcptenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
+	mcclient "github.com/kcp-dev/multicluster-provider/client"
 
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"