Skip to content

Commit 12bd591

Browse files
stttssttts
committed
make imports
Signed-off-by: Dr. Stefan Schimanski <[email protected]>
1 parent db92f53 commit 12bd591

File tree

16 files changed

+49
-32
lines changed

16 files changed

+49
-32
lines changed

‎examples/cluster-api/main.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ import (
2222
"os"
2323

2424
"golang.org/x/sync/errgroup"
25+
capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
26+
2527
corev1 "k8s.io/api/core/v1"
2628
apierrors "k8s.io/apimachinery/pkg/api/errors"
2729
"k8s.io/apimachinery/pkg/util/runtime"
2830
"k8s.io/client-go/kubernetes/scheme"
29-
capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
3031

3132
ctrl "sigs.k8s.io/controller-runtime"
3233
"sigs.k8s.io/controller-runtime/pkg/client"

‎examples/kind/main.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ import (
2222
"os"
2323

2424
"golang.org/x/sync/errgroup"
25+
2526
corev1 "k8s.io/api/core/v1"
2627
apierrors "k8s.io/apimachinery/pkg/api/errors"
27-
"sigs.k8s.io/controller-runtime/pkg/log/zap"
2828

2929
ctrl "sigs.k8s.io/controller-runtime"
3030
ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
31+
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3132
"sigs.k8s.io/controller-runtime/pkg/manager"
3233
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
3334
"sigs.k8s.io/controller-runtime/pkg/reconcile"

‎internal/forked/testing/addr/manager_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import (
2020
"net"
2121
"strconv"
2222

23+
"github.com/multicluster-runtime/multicluster-runtime/internal/forked/testing/addr"
24+
2325
. "github.com/onsi/ginkgo/v2"
2426
. "github.com/onsi/gomega"
25-
26-
"github.com/multicluster-runtime/multicluster-runtime/internal/forked/testing/addr"
2727
)
2828

2929
var _ = Describe("SuggestAddress", func() {

‎pkg/builder/forked_builder_suite_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ package builder
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo/v2"
23-
. "github.com/onsi/gomega"
24-
2522
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2623
"k8s.io/apimachinery/pkg/api/meta"
2724
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -35,6 +32,9 @@ import (
3532
"sigs.k8s.io/controller-runtime/pkg/webhook"
3633

3734
"github.com/multicluster-runtime/multicluster-runtime/internal/forked/testing/addr"
35+
36+
. "github.com/onsi/ginkgo/v2"
37+
. "github.com/onsi/gomega"
3838
)
3939

4040
func TestBuilder(t *testing.T) {

‎pkg/builder/forked_controller.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,25 @@ import (
2424

2525
"github.com/go-logr/logr"
2626

27-
"sigs.k8s.io/controller-runtime/pkg/source"
28-
2927
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3028
"k8s.io/apimachinery/pkg/runtime/schema"
3129
"k8s.io/klog/v2"
3230
"k8s.io/utils/ptr"
3331

34-
mccontroller "github.com/multicluster-runtime/multicluster-runtime/pkg/controller"
35-
mchandler "github.com/multicluster-runtime/multicluster-runtime/pkg/handler"
36-
mcmanager "github.com/multicluster-runtime/multicluster-runtime/pkg/manager"
37-
mcreconcile "github.com/multicluster-runtime/multicluster-runtime/pkg/reconcile"
38-
mcsource "github.com/multicluster-runtime/multicluster-runtime/pkg/source"
3932
"sigs.k8s.io/controller-runtime/pkg/client"
4033
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
4134
"sigs.k8s.io/controller-runtime/pkg/cluster"
4235
"sigs.k8s.io/controller-runtime/pkg/controller"
4336
"sigs.k8s.io/controller-runtime/pkg/handler"
4437
"sigs.k8s.io/controller-runtime/pkg/predicate"
4538
"sigs.k8s.io/controller-runtime/pkg/reconcile"
39+
"sigs.k8s.io/controller-runtime/pkg/source"
40+
41+
mccontroller "github.com/multicluster-runtime/multicluster-runtime/pkg/controller"
42+
mchandler "github.com/multicluster-runtime/multicluster-runtime/pkg/handler"
43+
mcmanager "github.com/multicluster-runtime/multicluster-runtime/pkg/manager"
44+
mcreconcile "github.com/multicluster-runtime/multicluster-runtime/pkg/reconcile"
45+
mcsource "github.com/multicluster-runtime/multicluster-runtime/pkg/source"
4646
)
4747

4848
// project represents other forms that we can use to

‎pkg/builder/forked_controller_test.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ import (
2323
"sync/atomic"
2424

2525
"github.com/go-logr/logr"
26-
. "github.com/onsi/ginkgo/v2"
27-
. "github.com/onsi/gomega"
26+
2827
appsv1 "k8s.io/api/apps/v1"
2928
corev1 "k8s.io/api/core/v1"
3029
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -34,7 +33,6 @@ import (
3433
"k8s.io/client-go/rest"
3534
"k8s.io/client-go/util/workqueue"
3635
"k8s.io/utils/ptr"
37-
"sigs.k8s.io/controller-runtime/pkg/source"
3836

3937
"sigs.k8s.io/controller-runtime/pkg/cache"
4038
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -44,12 +42,16 @@ import (
4442
"sigs.k8s.io/controller-runtime/pkg/predicate"
4543
"sigs.k8s.io/controller-runtime/pkg/reconcile"
4644
"sigs.k8s.io/controller-runtime/pkg/scheme"
45+
"sigs.k8s.io/controller-runtime/pkg/source"
4746

4847
mccontroller "github.com/multicluster-runtime/multicluster-runtime/pkg/controller"
4948
mchandler "github.com/multicluster-runtime/multicluster-runtime/pkg/handler"
5049
mcmanager "github.com/multicluster-runtime/multicluster-runtime/pkg/manager"
5150
mcreconcile "github.com/multicluster-runtime/multicluster-runtime/pkg/reconcile"
5251
mcsource "github.com/multicluster-runtime/multicluster-runtime/pkg/source"
52+
53+
. "github.com/onsi/ginkgo/v2"
54+
. "github.com/onsi/gomega"
5355
)
5456

5557
var _ untypedWatchesInput = (*WatchesInput[mcreconcile.Request])(nil)

‎pkg/builder/forked_webhook_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ import (
2727
"strings"
2828

2929
"github.com/go-logr/logr"
30-
. "github.com/onsi/ginkgo/v2"
31-
. "github.com/onsi/gomega"
3230
"github.com/onsi/gomega/gbytes"
3331

3432
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -40,6 +38,9 @@ import (
4038
"sigs.k8s.io/controller-runtime/pkg/manager"
4139
"sigs.k8s.io/controller-runtime/pkg/scheme"
4240
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
41+
42+
. "github.com/onsi/ginkgo/v2"
43+
. "github.com/onsi/gomega"
4344
)
4445

4546
const (

‎pkg/context/cluster.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ package context
1919
import (
2020
"context"
2121

22-
mcreconcile "github.com/multicluster-runtime/multicluster-runtime/pkg/reconcile"
2322
"sigs.k8s.io/controller-runtime/pkg/reconcile"
23+
24+
mcreconcile "github.com/multicluster-runtime/multicluster-runtime/pkg/reconcile"
2425
)
2526

2627
type clusterKeyType string

‎pkg/controller/controller.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"sync"
2323

2424
"k8s.io/client-go/util/workqueue"
25+
2526
"sigs.k8s.io/controller-runtime/pkg/client"
2627
"sigs.k8s.io/controller-runtime/pkg/cluster"
2728
"sigs.k8s.io/controller-runtime/pkg/controller"

‎providers/cluster-api/provider.go‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,24 @@ import (
2323
"time"
2424

2525
"github.com/go-logr/logr"
26+
capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
27+
utilkubeconfig "sigs.k8s.io/cluster-api/util/kubeconfig"
28+
2629
apierrors "k8s.io/apimachinery/pkg/api/errors"
2730
"k8s.io/apimachinery/pkg/types"
2831
"k8s.io/client-go/rest"
29-
capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
30-
utilkubeconfig "sigs.k8s.io/cluster-api/util/kubeconfig"
32+
"k8s.io/client-go/tools/clientcmd"
33+
3134
"sigs.k8s.io/controller-runtime/pkg/builder"
3235
"sigs.k8s.io/controller-runtime/pkg/client"
36+
"sigs.k8s.io/controller-runtime/pkg/cluster"
3337
"sigs.k8s.io/controller-runtime/pkg/controller"
38+
"sigs.k8s.io/controller-runtime/pkg/log"
3439
"sigs.k8s.io/controller-runtime/pkg/manager"
3540
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3641

3742
mcmanager "github.com/multicluster-runtime/multicluster-runtime/pkg/manager"
3843
"github.com/multicluster-runtime/multicluster-runtime/pkg/multicluster"
39-
"k8s.io/client-go/tools/clientcmd"
40-
"sigs.k8s.io/controller-runtime/pkg/cluster"
41-
"sigs.k8s.io/controller-runtime/pkg/log"
4244
)
4345

4446
var _ multicluster.Provider = &Provider{}

0 commit comments

Comments
 (0)