Skip to content

Commit 25a6be0

Browse files
moelsayedmoelsayed
committed
fmtd files
1 parent 72fb714 commit 25a6be0

17 files changed

+52
-50
lines changed

‎api/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 1 addition & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/controller/controlplane_controller.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ import (
2323
"time"
2424

2525
"github.com/go-logr/logr"
26-
"github.com/openmcp-project/control-plane-operator/internal/ocm"
2726
"k8s.io/apimachinery/pkg/types"
2827

28+
"github.com/openmcp-project/control-plane-operator/internal/ocm"
29+
2930
"github.com/openmcp-project/control-plane-operator/cmd/options"
3031
"github.com/openmcp-project/control-plane-operator/internal/schemes"
3132
"github.com/openmcp-project/control-plane-operator/pkg/controlplane/components/clusterroles"
@@ -39,11 +40,6 @@ import (
3940
"github.com/openmcp-project/control-plane-operator/pkg/juggler/object"
4041
"github.com/openmcp-project/control-plane-operator/pkg/utils/rcontext"
4142

42-
corev1beta1 "github.com/openmcp-project/control-plane-operator/api/v1beta1"
43-
"github.com/openmcp-project/control-plane-operator/pkg/controlplane/components"
44-
"github.com/openmcp-project/control-plane-operator/pkg/controlplane/kubeconfiggen"
45-
"github.com/openmcp-project/control-plane-operator/pkg/controlplane/targetrbac"
46-
"github.com/openmcp-project/control-plane-operator/pkg/utils"
4743
corev1 "k8s.io/api/core/v1"
4844
apierrors "k8s.io/apimachinery/pkg/api/errors"
4945
condApi "k8s.io/apimachinery/pkg/api/meta"
@@ -54,6 +50,12 @@ import (
5450
"sigs.k8s.io/controller-runtime/pkg/client"
5551
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
5652
"sigs.k8s.io/controller-runtime/pkg/log"
53+
54+
corev1beta1 "github.com/openmcp-project/control-plane-operator/api/v1beta1"
55+
"github.com/openmcp-project/control-plane-operator/pkg/controlplane/components"
56+
"github.com/openmcp-project/control-plane-operator/pkg/controlplane/kubeconfiggen"
57+
"github.com/openmcp-project/control-plane-operator/pkg/controlplane/targetrbac"
58+
"github.com/openmcp-project/control-plane-operator/pkg/utils"
5759
)
5860

5961
const (

‎internal/controller/controlplane_controller_test.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ import (
1212

1313
"github.com/openmcp-project/controller-utils/pkg/clientconfig"
1414

15-
corev1beta1 "github.com/openmcp-project/control-plane-operator/api/v1beta1"
16-
"github.com/openmcp-project/control-plane-operator/cmd/options"
17-
"github.com/openmcp-project/control-plane-operator/internal/schemes"
18-
"github.com/openmcp-project/control-plane-operator/pkg/controlplane/kubeconfiggen"
19-
"github.com/openmcp-project/control-plane-operator/pkg/controlplane/secretresolver"
20-
envtestutil "github.com/openmcp-project/control-plane-operator/pkg/utils/envtest"
2115
"github.com/stretchr/testify/assert"
2216
corev1 "k8s.io/api/core/v1"
2317
apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -33,6 +27,13 @@ import (
3327
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3428
"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
3529
"sigs.k8s.io/controller-runtime/pkg/envtest"
30+
31+
corev1beta1 "github.com/openmcp-project/control-plane-operator/api/v1beta1"
32+
"github.com/openmcp-project/control-plane-operator/cmd/options"
33+
"github.com/openmcp-project/control-plane-operator/internal/schemes"
34+
"github.com/openmcp-project/control-plane-operator/pkg/controlplane/kubeconfiggen"
35+
"github.com/openmcp-project/control-plane-operator/pkg/controlplane/secretresolver"
36+
envtestutil "github.com/openmcp-project/control-plane-operator/pkg/utils/envtest"
3637
)
3738

3839
func TestMain(m *testing.M) {

‎internal/controller/kubeconfigs.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ import (
55
"errors"
66
"time"
77

8-
corev1beta1 "github.com/openmcp-project/control-plane-operator/api/v1beta1"
9-
"github.com/openmcp-project/control-plane-operator/pkg/utils"
108
corev1 "k8s.io/api/core/v1"
119
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1210
"k8s.io/client-go/rest"
1311
"k8s.io/client-go/tools/clientcmd"
1412
"sigs.k8s.io/controller-runtime/pkg/client"
1513
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
14+
15+
corev1beta1 "github.com/openmcp-project/control-plane-operator/api/v1beta1"
16+
"github.com/openmcp-project/control-plane-operator/pkg/utils"
1617
)
1718

1819
const (

‎internal/controller/releasechannel_controller.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/openmcp-project/control-plane-operator/api/v1beta1"
8-
"github.com/openmcp-project/control-plane-operator/internal/ocm"
97
corev1 "k8s.io/api/core/v1"
108
"k8s.io/apimachinery/pkg/runtime"
119
ocmlib "ocm.software/ocm/api/ocm"
@@ -15,6 +13,9 @@ import (
1513
"sigs.k8s.io/controller-runtime/pkg/event"
1614
"sigs.k8s.io/controller-runtime/pkg/log"
1715
"sigs.k8s.io/controller-runtime/pkg/predicate"
16+
17+
"github.com/openmcp-project/control-plane-operator/api/v1beta1"
18+
"github.com/openmcp-project/control-plane-operator/internal/ocm"
1819
)
1920

2021
type ReleaseChannelReconciler struct {

‎internal/controller/releasechannel_controller_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ import (
77
"testing"
88
"time"
99

10-
corev1beta1 "github.com/openmcp-project/control-plane-operator/api/v1beta1"
11-
"github.com/openmcp-project/control-plane-operator/internal/schemes"
1210
"github.com/stretchr/testify/assert"
1311
corev1 "k8s.io/api/core/v1"
1412
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1513
ctrl "sigs.k8s.io/controller-runtime"
1614
"sigs.k8s.io/controller-runtime/pkg/client"
1715
"sigs.k8s.io/controller-runtime/pkg/client/fake"
16+
17+
corev1beta1 "github.com/openmcp-project/control-plane-operator/api/v1beta1"
18+
"github.com/openmcp-project/control-plane-operator/internal/schemes"
1819
)
1920

2021
const localOCMRegistryTestDataPath = "../../test/testdata/ocm_registry.tgz"

‎internal/controller/remote_config_builder.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package controller
22

33
import (
4-
"github.com/openmcp-project/control-plane-operator/api/v1beta1"
54
"github.com/openmcp-project/controller-utils/pkg/clientconfig"
65
"k8s.io/client-go/rest"
6+
7+
"github.com/openmcp-project/control-plane-operator/api/v1beta1"
78
)
89

910
type RemoteConfigBuilder func(target v1beta1.Target) (*rest.Config, clientconfig.ReloadFunc, error)

‎internal/controller/remote_config_builder_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ package controller
33
import (
44
"testing"
55

6-
"github.com/openmcp-project/control-plane-operator/api/v1beta1"
76
"github.com/openmcp-project/controller-utils/pkg/api"
87
"github.com/openmcp-project/controller-utils/pkg/clientconfig"
98
"github.com/stretchr/testify/assert"
109
"k8s.io/client-go/rest"
10+
11+
"github.com/openmcp-project/control-plane-operator/api/v1beta1"
1112
)
1213

1314
func TestNewRemoteConfigBuilder(t *testing.T) {

‎internal/controller/secret_controller.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import (
77

88
"github.com/openmcp-project/control-plane-operator/pkg/constants"
99

10-
corev1beta1 "github.com/openmcp-project/control-plane-operator/api/v1beta1"
11-
"github.com/openmcp-project/control-plane-operator/pkg/utils"
1210
corev1 "k8s.io/api/core/v1"
1311
apierrors "k8s.io/apimachinery/pkg/api/errors"
1412
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -18,6 +16,9 @@ import (
1816
"sigs.k8s.io/controller-runtime/pkg/client"
1917
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
2018
"sigs.k8s.io/controller-runtime/pkg/log"
19+
20+
corev1beta1 "github.com/openmcp-project/control-plane-operator/api/v1beta1"
21+
"github.com/openmcp-project/control-plane-operator/pkg/utils"
2122
)
2223

2324
const (

‎internal/controller/secret_controller_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"errors"
66
"testing"
77

8-
"github.com/openmcp-project/control-plane-operator/pkg/constants"
98
"github.com/stretchr/testify/assert"
109
corev1 "k8s.io/api/core/v1"
1110
apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -16,6 +15,8 @@ import (
1615
"sigs.k8s.io/controller-runtime/pkg/client/fake"
1716
"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
1817
"sigs.k8s.io/controller-runtime/pkg/event"
18+
19+
"github.com/openmcp-project/control-plane-operator/pkg/constants"
1920
)
2021

2122
var (

0 commit comments

Comments
 (0)