Skip to content

Commit 9be7693

Browse files
LalatenduMohantyLalatenduMohanty
authored
Moving pkgs to internal/operator-controller/ (operator-framework#1737)
This partially fixes operator-framework#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 <[email protected]>
1 parent 4304961 commit 9be7693

File tree

78 files changed

+85
-85
lines changed

Some content is hidden

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

78 files changed

+85
-85
lines changed

Diff for: ‎api/v1/clusterextension_types_test.go

+1-1
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) {

Diff for: ‎catalogd/internal/source/containers_image.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2424

2525
catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
26-
"github.com/operator-framework/operator-controller/internal/httputil"
26+
"github.com/operator-framework/operator-controller/internal/operator-controller/httputil"
2727
fsutil "github.com/operator-framework/operator-controller/internal/util/fs"
2828
imageutil "github.com/operator-framework/operator-controller/internal/util/image"
2929
)

Diff for: ‎cmd/operator-controller/main.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,20 @@ import (
5656

5757
ocv1 "github.com/operator-framework/operator-controller/api/v1"
5858
catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
59-
"github.com/operator-framework/operator-controller/internal/action"
60-
"github.com/operator-framework/operator-controller/internal/applier"
61-
"github.com/operator-framework/operator-controller/internal/authentication"
62-
"github.com/operator-framework/operator-controller/internal/catalogmetadata/cache"
63-
catalogclient "github.com/operator-framework/operator-controller/internal/catalogmetadata/client"
64-
"github.com/operator-framework/operator-controller/internal/contentmanager"
65-
"github.com/operator-framework/operator-controller/internal/controllers"
66-
"github.com/operator-framework/operator-controller/internal/features"
67-
"github.com/operator-framework/operator-controller/internal/finalizers"
68-
"github.com/operator-framework/operator-controller/internal/httputil"
69-
"github.com/operator-framework/operator-controller/internal/resolve"
70-
"github.com/operator-framework/operator-controller/internal/rukpak/preflights/crdupgradesafety"
71-
"github.com/operator-framework/operator-controller/internal/rukpak/source"
72-
"github.com/operator-framework/operator-controller/internal/scheme"
59+
"github.com/operator-framework/operator-controller/internal/operator-controller/action"
60+
"github.com/operator-framework/operator-controller/internal/operator-controller/applier"
61+
"github.com/operator-framework/operator-controller/internal/operator-controller/authentication"
62+
"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/cache"
63+
catalogclient "github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/client"
64+
"github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager"
65+
"github.com/operator-framework/operator-controller/internal/operator-controller/controllers"
66+
"github.com/operator-framework/operator-controller/internal/operator-controller/features"
67+
"github.com/operator-framework/operator-controller/internal/operator-controller/finalizers"
68+
"github.com/operator-framework/operator-controller/internal/operator-controller/httputil"
69+
"github.com/operator-framework/operator-controller/internal/operator-controller/resolve"
70+
"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/preflights/crdupgradesafety"
71+
"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/source"
72+
"github.com/operator-framework/operator-controller/internal/operator-controller/scheme"
7373
fsutil "github.com/operator-framework/operator-controller/internal/util/fs"
7474
"github.com/operator-framework/operator-controller/internal/version"
7575
)

Diff for: ‎internal/action/error/errors.go renamed to ‎internal/operator-controller/action/error/errors.go

File renamed without changes.

Diff for: ‎internal/action/error/errors_test.go renamed to ‎internal/operator-controller/action/error/errors_test.go

File renamed without changes.

Diff for: ‎internal/action/helm.go renamed to ‎internal/operator-controller/action/helm.go

+1-1
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 {

Diff for: ‎internal/action/helm_test.go renamed to ‎internal/operator-controller/action/helm_test.go

File renamed without changes.

Diff for: ‎internal/action/restconfig.go renamed to ‎internal/operator-controller/action/restconfig.go

+1-1
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) {

Diff for: ‎internal/action/storagedriver.go renamed to ‎internal/operator-controller/action/storagedriver.go

File renamed without changes.

Diff for: ‎internal/applier/helm.go renamed to ‎internal/operator-controller/applier/helm.go

+4-4
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 (

Diff for: ‎internal/applier/helm_test.go renamed to ‎internal/operator-controller/applier/helm_test.go

+2-2
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 {

Diff for: ‎internal/authentication/tokengetter.go renamed to ‎internal/operator-controller/authentication/tokengetter.go

File renamed without changes.

Diff for: ‎internal/authentication/tokengetter_test.go renamed to ‎internal/operator-controller/authentication/tokengetter_test.go

File renamed without changes.

Diff for: ‎internal/authentication/tripper.go renamed to ‎internal/operator-controller/authentication/tripper.go

File renamed without changes.

Diff for: ‎internal/bundleutil/bundle.go renamed to ‎internal/operator-controller/bundleutil/bundle.go

File renamed without changes.

Diff for: ‎internal/bundleutil/bundle_test.go renamed to ‎internal/operator-controller/bundleutil/bundle_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/operator-framework/operator-registry/alpha/declcfg"
1010
"github.com/operator-framework/operator-registry/alpha/property"
1111

12-
"github.com/operator-framework/operator-controller/internal/bundleutil"
12+
"github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil"
1313
)
1414

1515
func TestGetVersion(t *testing.T) {

Diff for: ‎internal/catalogmetadata/cache/cache.go renamed to ‎internal/operator-controller/catalogmetadata/cache/cache.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
"github.com/operator-framework/operator-registry/alpha/declcfg"
1212

13-
"github.com/operator-framework/operator-controller/internal/catalogmetadata/client"
13+
"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/client"
1414
)
1515

1616
var _ client.Cache = &filesystemCache{}

Diff for: ‎internal/catalogmetadata/cache/cache_test.go renamed to ‎internal/operator-controller/catalogmetadata/cache/cache_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/stretchr/testify/require"
1919
"k8s.io/apimachinery/pkg/util/sets"
2020

21-
"github.com/operator-framework/operator-controller/internal/catalogmetadata/cache"
21+
"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/cache"
2222
)
2323

2424
const (

Diff for: ‎internal/catalogmetadata/client/client.go renamed to ‎internal/operator-controller/catalogmetadata/client/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/operator-framework/operator-registry/alpha/declcfg"
1717

1818
catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
19-
"github.com/operator-framework/operator-controller/internal/httputil"
19+
"github.com/operator-framework/operator-controller/internal/operator-controller/httputil"
2020
)
2121

2222
const (

Diff for: ‎internal/catalogmetadata/client/client_test.go renamed to ‎internal/operator-controller/catalogmetadata/client/client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/operator-framework/operator-registry/alpha/declcfg"
1818

1919
catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
20-
catalogClient "github.com/operator-framework/operator-controller/internal/catalogmetadata/client"
20+
catalogClient "github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/client"
2121
)
2222

2323
func defaultCatalog() *catalogd.ClusterCatalog {

Diff for: ‎internal/catalogmetadata/compare/compare.go renamed to ‎internal/operator-controller/catalogmetadata/compare/compare.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/operator-framework/operator-registry/alpha/declcfg"
77

8-
"github.com/operator-framework/operator-controller/internal/bundleutil"
8+
"github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil"
99
)
1010

1111
// ByVersion is a sort "less" function that orders bundles

Diff for: ‎internal/catalogmetadata/compare/compare_test.go renamed to ‎internal/operator-controller/catalogmetadata/compare/compare_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/operator-framework/operator-registry/alpha/declcfg"
1111
"github.com/operator-framework/operator-registry/alpha/property"
1212

13-
"github.com/operator-framework/operator-controller/internal/catalogmetadata/compare"
13+
"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/compare"
1414
)
1515

1616
func TestByVersion(t *testing.T) {

Diff for: ‎internal/catalogmetadata/filter/bundle_predicates.go renamed to ‎internal/operator-controller/catalogmetadata/filter/bundle_predicates.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/operator-framework/operator-registry/alpha/declcfg"
77

8-
"github.com/operator-framework/operator-controller/internal/bundleutil"
8+
"github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil"
99
"github.com/operator-framework/operator-controller/internal/util/filter"
1010
)
1111

Diff for: ‎internal/catalogmetadata/filter/bundle_predicates_test.go renamed to ‎internal/operator-controller/catalogmetadata/filter/bundle_predicates_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/operator-framework/operator-registry/alpha/declcfg"
1212
"github.com/operator-framework/operator-registry/alpha/property"
1313

14-
"github.com/operator-framework/operator-controller/internal/catalogmetadata/filter"
14+
"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/filter"
1515
)
1616

1717
func TestInMastermindsSemverRange(t *testing.T) {

Diff for: ‎internal/catalogmetadata/filter/successors.go renamed to ‎internal/operator-controller/catalogmetadata/filter/successors.go

File renamed without changes.

Diff for: ‎internal/catalogmetadata/filter/successors_test.go renamed to ‎internal/operator-controller/catalogmetadata/filter/successors_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"github.com/operator-framework/operator-registry/alpha/property"
1515

1616
ocv1 "github.com/operator-framework/operator-controller/api/v1"
17-
"github.com/operator-framework/operator-controller/internal/bundleutil"
18-
"github.com/operator-framework/operator-controller/internal/catalogmetadata/compare"
17+
"github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil"
18+
"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/compare"
1919
"github.com/operator-framework/operator-controller/internal/util/filter"
2020
)
2121

Diff for: ‎internal/conditionsets/conditionsets.go renamed to ‎internal/operator-controller/conditionsets/conditionsets.go

File renamed without changes.

Diff for: ‎internal/contentmanager/cache/cache.go renamed to ‎internal/operator-controller/contentmanager/cache/cache.go

File renamed without changes.

Diff for: ‎internal/contentmanager/cache/cache_test.go renamed to ‎internal/operator-controller/contentmanager/cache/cache_test.go

File renamed without changes.

Diff for: ‎internal/contentmanager/contentmanager.go renamed to ‎internal/operator-controller/contentmanager/contentmanager.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"k8s.io/client-go/rest"
1515
"sigs.k8s.io/controller-runtime/pkg/client"
1616

17-
"github.com/operator-framework/operator-controller/api/v1"
18-
cmcache "github.com/operator-framework/operator-controller/internal/contentmanager/cache"
19-
oclabels "github.com/operator-framework/operator-controller/internal/labels"
17+
v1 "github.com/operator-framework/operator-controller/api/v1"
18+
cmcache "github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager/cache"
19+
oclabels "github.com/operator-framework/operator-controller/internal/operator-controller/labels"
2020
)
2121

2222
// Manager is a utility to manage content caches belonging

Diff for: ‎internal/contentmanager/source/dynamicsource.go renamed to ‎internal/operator-controller/contentmanager/source/dynamicsource.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"sigs.k8s.io/controller-runtime/pkg/predicate"
1919
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2020

21-
source "github.com/operator-framework/operator-controller/internal/contentmanager/source/internal"
21+
source "github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager/source/internal"
2222
)
2323

2424
type DynamicSourceConfig struct {

Diff for: ‎internal/contentmanager/source/dynamicsource_test.go renamed to ‎internal/operator-controller/contentmanager/source/dynamicsource_test.go

File renamed without changes.

Diff for: ‎internal/contentmanager/source/internal/eventhandler.go renamed to ‎internal/operator-controller/contentmanager/source/internal/eventhandler.go

File renamed without changes.

Diff for: ‎internal/contentmanager/sourcerer.go renamed to ‎internal/operator-controller/contentmanager/sourcerer.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515
"sigs.k8s.io/controller-runtime/pkg/handler"
1616
"sigs.k8s.io/controller-runtime/pkg/predicate"
1717

18-
"github.com/operator-framework/operator-controller/api/v1"
19-
"github.com/operator-framework/operator-controller/internal/contentmanager/cache"
20-
"github.com/operator-framework/operator-controller/internal/contentmanager/source"
18+
v1 "github.com/operator-framework/operator-controller/api/v1"
19+
"github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager/cache"
20+
"github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager/source"
2121
)
2222

2323
type dynamicSourcerer struct {

Diff for: ‎internal/controllers/clustercatalog_controller.go renamed to ‎internal/operator-controller/controllers/clustercatalog_controller.go

File renamed without changes.

Diff for: ‎internal/controllers/clustercatalog_controller_test.go renamed to ‎internal/operator-controller/controllers/clustercatalog_controller_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"sigs.k8s.io/controller-runtime/pkg/client/fake"
1616

1717
catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
18-
"github.com/operator-framework/operator-controller/internal/controllers"
19-
"github.com/operator-framework/operator-controller/internal/scheme"
18+
"github.com/operator-framework/operator-controller/internal/operator-controller/controllers"
19+
"github.com/operator-framework/operator-controller/internal/operator-controller/scheme"
2020
)
2121

2222
func TestClusterCatalogReconcilerFinalizers(t *testing.T) {

Diff for: ‎internal/controllers/clusterextension_admission_test.go renamed to ‎internal/operator-controller/controllers/clusterextension_admission_test.go

File renamed without changes.

Diff for: ‎internal/controllers/clusterextension_controller.go renamed to ‎internal/operator-controller/controllers/clusterextension_controller.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ import (
5050

5151
ocv1 "github.com/operator-framework/operator-controller/api/v1"
5252
catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
53-
"github.com/operator-framework/operator-controller/internal/authentication"
54-
"github.com/operator-framework/operator-controller/internal/bundleutil"
55-
"github.com/operator-framework/operator-controller/internal/conditionsets"
56-
"github.com/operator-framework/operator-controller/internal/contentmanager"
57-
"github.com/operator-framework/operator-controller/internal/labels"
58-
"github.com/operator-framework/operator-controller/internal/resolve"
59-
rukpaksource "github.com/operator-framework/operator-controller/internal/rukpak/source"
53+
"github.com/operator-framework/operator-controller/internal/operator-controller/authentication"
54+
"github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil"
55+
"github.com/operator-framework/operator-controller/internal/operator-controller/conditionsets"
56+
"github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager"
57+
"github.com/operator-framework/operator-controller/internal/operator-controller/labels"
58+
"github.com/operator-framework/operator-controller/internal/operator-controller/resolve"
59+
rukpaksource "github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/source"
6060
)
6161

6262
const (

Diff for: ‎internal/controllers/clusterextension_controller_test.go renamed to ‎internal/operator-controller/controllers/clusterextension_controller_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ import (
2828
"github.com/operator-framework/operator-registry/alpha/declcfg"
2929

3030
ocv1 "github.com/operator-framework/operator-controller/api/v1"
31-
"github.com/operator-framework/operator-controller/internal/authentication"
32-
"github.com/operator-framework/operator-controller/internal/conditionsets"
33-
"github.com/operator-framework/operator-controller/internal/controllers"
34-
"github.com/operator-framework/operator-controller/internal/finalizers"
35-
"github.com/operator-framework/operator-controller/internal/labels"
36-
"github.com/operator-framework/operator-controller/internal/resolve"
37-
"github.com/operator-framework/operator-controller/internal/rukpak/source"
31+
"github.com/operator-framework/operator-controller/internal/operator-controller/authentication"
32+
"github.com/operator-framework/operator-controller/internal/operator-controller/conditionsets"
33+
"github.com/operator-framework/operator-controller/internal/operator-controller/controllers"
34+
"github.com/operator-framework/operator-controller/internal/operator-controller/finalizers"
35+
"github.com/operator-framework/operator-controller/internal/operator-controller/labels"
36+
"github.com/operator-framework/operator-controller/internal/operator-controller/resolve"
37+
"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/source"
3838
)
3939

4040
// Describe: ClusterExtension Controller Test

Diff for: ‎internal/controllers/common_controller.go renamed to ‎internal/operator-controller/controllers/common_controller.go

File renamed without changes.

Diff for: ‎internal/controllers/common_controller_test.go renamed to ‎internal/operator-controller/controllers/common_controller_test.go

File renamed without changes.

Diff for: ‎internal/controllers/pull_secret_controller.go renamed to ‎internal/operator-controller/controllers/pull_secret_controller.go

File renamed without changes.

Diff for: ‎internal/controllers/pull_secret_controller_test.go renamed to ‎internal/operator-controller/controllers/pull_secret_controller_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
ctrl "sigs.k8s.io/controller-runtime"
1414
"sigs.k8s.io/controller-runtime/pkg/client/fake"
1515

16-
"github.com/operator-framework/operator-controller/internal/controllers"
17-
"github.com/operator-framework/operator-controller/internal/scheme"
16+
"github.com/operator-framework/operator-controller/internal/operator-controller/controllers"
17+
"github.com/operator-framework/operator-controller/internal/operator-controller/scheme"
1818
)
1919

2020
func TestSecretSyncerReconciler(t *testing.T) {

Diff for: ‎internal/controllers/suite_test.go renamed to ‎internal/operator-controller/controllers/suite_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ import (
3636
helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
3737

3838
ocv1 "github.com/operator-framework/operator-controller/api/v1"
39-
"github.com/operator-framework/operator-controller/internal/contentmanager"
40-
cmcache "github.com/operator-framework/operator-controller/internal/contentmanager/cache"
41-
"github.com/operator-framework/operator-controller/internal/controllers"
42-
"github.com/operator-framework/operator-controller/internal/rukpak/source"
39+
"github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager"
40+
cmcache "github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager/cache"
41+
"github.com/operator-framework/operator-controller/internal/operator-controller/controllers"
42+
"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/source"
4343
)
4444

4545
// MockUnpacker is a mock of Unpacker interface
@@ -158,7 +158,7 @@ var (
158158
func TestMain(m *testing.M) {
159159
testEnv := &envtest.Environment{
160160
CRDDirectoryPaths: []string{
161-
filepath.Join("..", "..", "config", "base", "crd", "bases"),
161+
filepath.Join("..", "..", "..", "config", "base", "crd", "bases"),
162162
},
163163
ErrorIfCRDPathMissing: true,
164164
}

Diff for: ‎internal/features/features.go renamed to ‎internal/operator-controller/features/features.go

File renamed without changes.

Diff for: ‎internal/finalizers/finalizers.go renamed to ‎internal/operator-controller/finalizers/finalizers.go

File renamed without changes.

Diff for: ‎internal/httputil/certlog.go renamed to ‎internal/operator-controller/httputil/certlog.go

File renamed without changes.

Diff for: ‎internal/httputil/certpoolwatcher.go renamed to ‎internal/operator-controller/httputil/certpoolwatcher.go

File renamed without changes.

Diff for: ‎internal/httputil/certpoolwatcher_test.go renamed to ‎internal/operator-controller/httputil/certpoolwatcher_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/stretchr/testify/require"
1818
"sigs.k8s.io/controller-runtime/pkg/log"
1919

20-
"github.com/operator-framework/operator-controller/internal/httputil"
20+
"github.com/operator-framework/operator-controller/internal/operator-controller/httputil"
2121
)
2222

2323
func createCert(t *testing.T, name string) {

Diff for: ‎internal/httputil/certutil.go renamed to ‎internal/operator-controller/httputil/certutil.go

File renamed without changes.

Diff for: ‎internal/httputil/certutil_test.go renamed to ‎internal/operator-controller/httputil/certutil_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/go-logr/logr"
88
"github.com/stretchr/testify/require"
99

10-
"github.com/operator-framework/operator-controller/internal/httputil"
10+
"github.com/operator-framework/operator-controller/internal/operator-controller/httputil"
1111
)
1212

1313
// The "good" test consists of 3 Amazon Root CAs, along with a "PRIVATE KEY" in one of the files
@@ -17,9 +17,9 @@ func TestNewCertPool(t *testing.T) {
1717
dir string
1818
msg string
1919
}{
20-
{"../../testdata/certs/", `no certificates found in "../../testdata/certs/"`},
21-
{"../../testdata/certs/good", ""},
22-
{"../../testdata/certs/empty", `no certificates found in "../../testdata/certs/empty"`},
20+
{"../../../testdata/certs/", `no certificates found in "../../../testdata/certs/"`},
21+
{"../../../testdata/certs/good", ""},
22+
{"../../../testdata/certs/empty", `no certificates found in "../../../testdata/certs/empty"`},
2323
}
2424

2525
log, _ := logr.FromContext(context.Background())

Diff for: ‎internal/httputil/httputil.go renamed to ‎internal/operator-controller/httputil/httputil.go

File renamed without changes.

Diff for: ‎internal/labels/labels.go renamed to ‎internal/operator-controller/labels/labels.go

File renamed without changes.

Diff for: ‎internal/resolve/catalog.go renamed to ‎internal/operator-controller/resolve/catalog.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919

2020
ocv1 "github.com/operator-framework/operator-controller/api/v1"
2121
catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
22-
"github.com/operator-framework/operator-controller/internal/bundleutil"
23-
"github.com/operator-framework/operator-controller/internal/catalogmetadata/compare"
24-
"github.com/operator-framework/operator-controller/internal/catalogmetadata/filter"
22+
"github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil"
23+
"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/compare"
24+
"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/filter"
2525
filterutil "github.com/operator-framework/operator-controller/internal/util/filter"
2626
)
2727

Diff for: ‎internal/resolve/catalog_test.go renamed to ‎internal/operator-controller/resolve/catalog_test.go

File renamed without changes.

Diff for: ‎internal/resolve/resolver.go renamed to ‎internal/operator-controller/resolve/resolver.go

File renamed without changes.

Diff for: ‎internal/resolve/validation.go renamed to ‎internal/operator-controller/resolve/validation.go

File renamed without changes.

Diff for: ‎internal/resolve/validation_test.go renamed to ‎internal/operator-controller/resolve/validation_test.go

File renamed without changes.

Diff for: ‎internal/rukpak/convert/registryv1.go renamed to ‎internal/operator-controller/rukpak/convert/registryv1.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
"github.com/operator-framework/operator-registry/alpha/property"
2828
registrybundle "github.com/operator-framework/operator-registry/pkg/lib/bundle"
2929

30-
registry "github.com/operator-framework/operator-controller/internal/rukpak/operator-registry"
31-
"github.com/operator-framework/operator-controller/internal/rukpak/util"
30+
registry "github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/operator-registry"
31+
"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/util"
3232
)
3333

3434
type RegistryV1 struct {

Diff for: ‎internal/rukpak/convert/registryv1_test.go renamed to ‎internal/operator-controller/rukpak/convert/registryv1_test.go

File renamed without changes.

Diff for: ‎internal/rukpak/convert/testdata/combine-properties-bundle/manifests/csv.yaml renamed to ‎internal/operator-controller/rukpak/convert/testdata/combine-properties-bundle/manifests/csv.yaml

File renamed without changes.

Diff for: ‎internal/rukpak/convert/testdata/combine-properties-bundle/metadata/annotations.yaml renamed to ‎internal/operator-controller/rukpak/convert/testdata/combine-properties-bundle/metadata/annotations.yaml

File renamed without changes.

Diff for: ‎internal/rukpak/convert/testdata/combine-properties-bundle/metadata/properties.yaml renamed to ‎internal/operator-controller/rukpak/convert/testdata/combine-properties-bundle/metadata/properties.yaml

File renamed without changes.

Diff for: ‎internal/rukpak/operator-registry/registry.go renamed to ‎internal/operator-controller/rukpak/operator-registry/registry.go

File renamed without changes.

Diff for: ‎internal/rukpak/preflights/crdupgradesafety/checks.go renamed to ‎internal/operator-controller/rukpak/preflights/crdupgradesafety/checks.go

File renamed without changes.

Diff for: ‎internal/rukpak/preflights/crdupgradesafety/checks_test.go renamed to ‎internal/operator-controller/rukpak/preflights/crdupgradesafety/checks_test.go

File renamed without changes.

Diff for: ‎internal/rukpak/preflights/crdupgradesafety/crdupgradesafety.go renamed to ‎internal/operator-controller/rukpak/preflights/crdupgradesafety/crdupgradesafety.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1717
"k8s.io/apimachinery/pkg/runtime"
1818

19-
"github.com/operator-framework/operator-controller/internal/rukpak/util"
19+
"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/util"
2020
)
2121

2222
type Option func(p *Preflight)

0 commit comments

Comments
 (0)