Skip to content

Commit 4c09b1a

Browse files
[WIP] Moving pkgs to internal/operator-controller/
This partially fixes #1707. The intent is to consolidate internal code from operator-controller and catalogd within internal e.g.: catalogd/ - code specific to catalogd internal/ - holds internal code of catalogd and operator-controller. internal/catalogd - holds unexported code specific to catalogd internal/operator-controller - holds unexported code specific to operator-comntroller internal/shared - shared code between catalogd and operator-controller which can not be exported outside. Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>
1 parent a38da78 commit 4c09b1a

File tree

76 files changed

+82
-81
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+82
-81
lines changed

api/v1/clusterextension_types_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"golang.org/x/exp/slices" // replace with "slices" in go 1.21
1414

15-
"github.com/operator-framework/operator-controller/internal/conditionsets"
15+
"github.com/operator-framework/operator-controller/internal/operator-controller/conditionsets"
1616
)
1717

1818
func TestClusterExtensionTypeRegistration(t *testing.T) {

cmd/operator-controller/main.go

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,23 @@ import (
5252

5353
helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
5454

55+
"github.com/operator-framework/operator-controller/internal/operator-controller/action"
56+
"github.com/operator-framework/operator-controller/internal/operator-controller/applier"
57+
5558
ocv1 "github.com/operator-framework/operator-controller/api/v1"
5659
catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
57-
"github.com/operator-framework/operator-controller/internal/action"
58-
"github.com/operator-framework/operator-controller/internal/applier"
59-
"github.com/operator-framework/operator-controller/internal/authentication"
60-
"github.com/operator-framework/operator-controller/internal/catalogmetadata/cache"
61-
catalogclient "github.com/operator-framework/operator-controller/internal/catalogmetadata/client"
62-
"github.com/operator-framework/operator-controller/internal/contentmanager"
63-
"github.com/operator-framework/operator-controller/internal/controllers"
64-
"github.com/operator-framework/operator-controller/internal/features"
65-
"github.com/operator-framework/operator-controller/internal/finalizers"
66-
"github.com/operator-framework/operator-controller/internal/httputil"
67-
"github.com/operator-framework/operator-controller/internal/resolve"
68-
"github.com/operator-framework/operator-controller/internal/rukpak/preflights/crdupgradesafety"
69-
"github.com/operator-framework/operator-controller/internal/rukpak/source"
70-
"github.com/operator-framework/operator-controller/internal/scheme"
60+
"github.com/operator-framework/operator-controller/internal/operator-controller/authentication"
61+
"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/cache"
62+
catalogclient "github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/client"
63+
"github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager"
64+
"github.com/operator-framework/operator-controller/internal/operator-controller/controllers"
65+
"github.com/operator-framework/operator-controller/internal/operator-controller/features"
66+
"github.com/operator-framework/operator-controller/internal/operator-controller/finalizers"
67+
"github.com/operator-framework/operator-controller/internal/operator-controller/httputil"
68+
"github.com/operator-framework/operator-controller/internal/operator-controller/resolve"
69+
"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/preflights/crdupgradesafety"
70+
"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/source"
71+
"github.com/operator-framework/operator-controller/internal/operator-controller/scheme"
7172
fsutil "github.com/operator-framework/operator-controller/internal/util/fs"
7273
"github.com/operator-framework/operator-controller/internal/version"
7374
)
File renamed without changes.
File renamed without changes.

internal/action/helm.go renamed to internal/operator-controller/action/helm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
actionclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
1111

12-
olmv1error "github.com/operator-framework/operator-controller/internal/action/error"
12+
olmv1error "github.com/operator-framework/operator-controller/internal/operator-controller/action/error"
1313
)
1414

1515
type ActionClientGetter struct {
File renamed without changes.

internal/action/restconfig.go renamed to internal/operator-controller/action/restconfig.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"sigs.k8s.io/controller-runtime/pkg/client"
1010

1111
ocv1 "github.com/operator-framework/operator-controller/api/v1"
12-
"github.com/operator-framework/operator-controller/internal/authentication"
12+
"github.com/operator-framework/operator-controller/internal/operator-controller/authentication"
1313
)
1414

1515
func ServiceAccountRestConfigMapper(tokenGetter *authentication.TokenGetter) func(ctx context.Context, o client.Object, c *rest.Config) (*rest.Config, error) {
File renamed without changes.

internal/applier/helm.go renamed to internal/operator-controller/applier/helm.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424
helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
2525

2626
ocv1 "github.com/operator-framework/operator-controller/api/v1"
27-
"github.com/operator-framework/operator-controller/internal/features"
28-
"github.com/operator-framework/operator-controller/internal/rukpak/convert"
29-
"github.com/operator-framework/operator-controller/internal/rukpak/preflights/crdupgradesafety"
30-
"github.com/operator-framework/operator-controller/internal/rukpak/util"
27+
"github.com/operator-framework/operator-controller/internal/operator-controller/features"
28+
"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/convert"
29+
"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/preflights/crdupgradesafety"
30+
"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/util"
3131
)
3232

3333
const (

internal/applier/helm_test.go renamed to internal/operator-controller/applier/helm_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
2020

2121
v1 "github.com/operator-framework/operator-controller/api/v1"
22-
"github.com/operator-framework/operator-controller/internal/applier"
23-
"github.com/operator-framework/operator-controller/internal/features"
22+
"github.com/operator-framework/operator-controller/internal/operator-controller/applier"
23+
"github.com/operator-framework/operator-controller/internal/operator-controller/features"
2424
)
2525

2626
type mockPreflight struct {

0 commit comments

Comments
 (0)