Skip to content

Commit b53c31c

Browse files
LalatenduMohantyLalatenduMohanty
authored
Moving code from catalogd/internal to internal/catalogd (#1746)
This partially fixes #1707. The intent is to consolidate internal code from operator-controller and catalogd within internal. This PR does not move catalogd/internal/controllers and catalogd/internal/webhook as it need explict changes in both op-con and catalogd Makefile. Which we will do in a followup PR. 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 81f0cfd commit b53c31c

18 files changed

Lines changed: 14 additions & 14 deletions

‎catalogd/cmd/catalogd/main.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ import (
5757

5858
catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
5959
corecontrollers "github.com/operator-framework/operator-controller/catalogd/internal/controllers/core"
60-
"github.com/operator-framework/operator-controller/catalogd/internal/features"
61-
"github.com/operator-framework/operator-controller/catalogd/internal/garbagecollection"
62-
catalogdmetrics "github.com/operator-framework/operator-controller/catalogd/internal/metrics"
63-
"github.com/operator-framework/operator-controller/catalogd/internal/serverutil"
64-
"github.com/operator-framework/operator-controller/catalogd/internal/source"
65-
"github.com/operator-framework/operator-controller/catalogd/internal/storage"
6660
"github.com/operator-framework/operator-controller/catalogd/internal/webhook"
61+
"github.com/operator-framework/operator-controller/internal/catalogd/features"
62+
"github.com/operator-framework/operator-controller/internal/catalogd/garbagecollection"
63+
catalogdmetrics "github.com/operator-framework/operator-controller/internal/catalogd/metrics"
64+
"github.com/operator-framework/operator-controller/internal/catalogd/serverutil"
65+
"github.com/operator-framework/operator-controller/internal/catalogd/source"
66+
"github.com/operator-framework/operator-controller/internal/catalogd/storage"
6767
fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"
6868
"github.com/operator-framework/operator-controller/internal/shared/version"
6969
)

‎catalogd/internal/controllers/core/clustercatalog_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ import (
3838
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3939

4040
catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
41-
"github.com/operator-framework/operator-controller/catalogd/internal/source"
42-
"github.com/operator-framework/operator-controller/catalogd/internal/storage"
41+
"github.com/operator-framework/operator-controller/internal/catalogd/source"
42+
"github.com/operator-framework/operator-controller/internal/catalogd/storage"
4343
)
4444

4545
const (

‎catalogd/internal/controllers/core/clustercatalog_controller_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2222

2323
catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
24-
"github.com/operator-framework/operator-controller/catalogd/internal/source"
25-
"github.com/operator-framework/operator-controller/catalogd/internal/storage"
24+
"github.com/operator-framework/operator-controller/internal/catalogd/source"
25+
"github.com/operator-framework/operator-controller/internal/catalogd/storage"
2626
)
2727

2828
var _ source.Unpacker = &MockSource{}

catalogd/internal/features/features.go renamed to internal/catalogd/features/features.go

File renamed without changes.

catalogd/internal/garbagecollection/garbage_collector.go renamed to internal/catalogd/garbagecollection/garbage_collector.go

File renamed without changes.

catalogd/internal/garbagecollection/garbage_collector_test.go renamed to internal/catalogd/garbagecollection/garbage_collector_test.go

File renamed without changes.

catalogd/internal/metrics/metrics.go renamed to internal/catalogd/metrics/metrics.go

File renamed without changes.

catalogd/internal/serverutil/serverutil.go renamed to internal/catalogd/serverutil/serverutil.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"sigs.k8s.io/controller-runtime/pkg/certwatcher"
1616
"sigs.k8s.io/controller-runtime/pkg/manager"
1717

18-
catalogdmetrics "github.com/operator-framework/operator-controller/catalogd/internal/metrics"
19-
"github.com/operator-framework/operator-controller/catalogd/internal/storage"
18+
catalogdmetrics "github.com/operator-framework/operator-controller/internal/catalogd/metrics"
19+
"github.com/operator-framework/operator-controller/internal/catalogd/storage"
2020
)
2121

2222
type CatalogServerConfig struct {

catalogd/internal/serverutil/serverutil_test.go renamed to internal/catalogd/serverutil/serverutil_test.go

File renamed without changes.

catalogd/internal/source/containers_image.go renamed to internal/catalogd/source/containers_image.go

File renamed without changes.

0 commit comments

Comments
 (0)