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 <[email protected]>

Author: LalatenduMohanty

catalogd/cmd/catalogd/main.go

@@ -57,13 +57,13 @@ import (
 
 	catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
 	corecontrollers "github.com/operator-framework/operator-controller/catalogd/internal/controllers/core"
-	"github.com/operator-framework/operator-controller/catalogd/internal/features"
-	"github.com/operator-framework/operator-controller/catalogd/internal/garbagecollection"
-	catalogdmetrics "github.com/operator-framework/operator-controller/catalogd/internal/metrics"
-	"github.com/operator-framework/operator-controller/catalogd/internal/serverutil"
-	"github.com/operator-framework/operator-controller/catalogd/internal/source"
-	"github.com/operator-framework/operator-controller/catalogd/internal/storage"
 	"github.com/operator-framework/operator-controller/catalogd/internal/webhook"
+	"github.com/operator-framework/operator-controller/internal/catalogd/features"
+	"github.com/operator-framework/operator-controller/internal/catalogd/garbagecollection"
+	catalogdmetrics "github.com/operator-framework/operator-controller/internal/catalogd/metrics"
+	"github.com/operator-framework/operator-controller/internal/catalogd/serverutil"
+	"github.com/operator-framework/operator-controller/internal/catalogd/source"
+	"github.com/operator-framework/operator-controller/internal/catalogd/storage"
 	fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"
 	"github.com/operator-framework/operator-controller/internal/shared/version"
 )

catalogd/internal/controllers/core/clustercatalog_controller.go

@@ -38,8 +38,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
-	"github.com/operator-framework/operator-controller/catalogd/internal/source"
-	"github.com/operator-framework/operator-controller/catalogd/internal/storage"
+	"github.com/operator-framework/operator-controller/internal/catalogd/source"
+	"github.com/operator-framework/operator-controller/internal/catalogd/storage"
 )
 
 const (

catalogd/internal/controllers/core/clustercatalog_controller_test.go

@@ -21,8 +21,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
-	"github.com/operator-framework/operator-controller/catalogd/internal/source"
-	"github.com/operator-framework/operator-controller/catalogd/internal/storage"
+	"github.com/operator-framework/operator-controller/internal/catalogd/source"
+	"github.com/operator-framework/operator-controller/internal/catalogd/storage"
 )
 
 var _ source.Unpacker = &MockSource{}

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

@@ -15,8 +15,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/certwatcher"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
-	catalogdmetrics "github.com/operator-framework/operator-controller/catalogd/internal/metrics"
-	"github.com/operator-framework/operator-controller/catalogd/internal/storage"
+	catalogdmetrics "github.com/operator-framework/operator-controller/internal/catalogd/metrics"
+	"github.com/operator-framework/operator-controller/internal/catalogd/storage"
 )
 
 type CatalogServerConfig struct {