Moving pkgs to internal/operator-controller/ (#1737)

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>

Author: LalatenduMohanty

api/v1/clusterextension_types_test.go

@@ -12,7 +12,7 @@ import (
 
 	"golang.org/x/exp/slices" // replace with "slices" in go 1.21
 
-	"github.com/operator-framework/operator-controller/internal/conditionsets"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/conditionsets"
 )
 
 func TestClusterExtensionTypeRegistration(t *testing.T) {

catalogd/internal/source/containers_image.go

@@ -23,7 +23,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
-	"github.com/operator-framework/operator-controller/internal/httputil"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/httputil"
 	fsutil "github.com/operator-framework/operator-controller/internal/util/fs"
 	imageutil "github.com/operator-framework/operator-controller/internal/util/image"
 )

cmd/operator-controller/main.go

@@ -56,20 +56,20 @@ import (
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
 	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
-	"github.com/operator-framework/operator-controller/internal/action"
-	"github.com/operator-framework/operator-controller/internal/applier"
-	"github.com/operator-framework/operator-controller/internal/authentication"
-	"github.com/operator-framework/operator-controller/internal/catalogmetadata/cache"
-	catalogclient "github.com/operator-framework/operator-controller/internal/catalogmetadata/client"
-	"github.com/operator-framework/operator-controller/internal/contentmanager"
-	"github.com/operator-framework/operator-controller/internal/controllers"
-	"github.com/operator-framework/operator-controller/internal/features"
-	"github.com/operator-framework/operator-controller/internal/finalizers"
-	"github.com/operator-framework/operator-controller/internal/httputil"
-	"github.com/operator-framework/operator-controller/internal/resolve"
-	"github.com/operator-framework/operator-controller/internal/rukpak/preflights/crdupgradesafety"
-	"github.com/operator-framework/operator-controller/internal/rukpak/source"
-	"github.com/operator-framework/operator-controller/internal/scheme"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/action"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/applier"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/authentication"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/cache"
+	catalogclient "github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/client"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/controllers"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/features"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/finalizers"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/httputil"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/resolve"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/preflights/crdupgradesafety"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/source"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/scheme"
 	fsutil "github.com/operator-framework/operator-controller/internal/util/fs"
 	"github.com/operator-framework/operator-controller/internal/version"
 )

internal/action/error/errors.go renamed to internal/operator-controller/action/error/errors.go

@@ -9,7 +9,7 @@ import (
 
 	actionclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
 
-	olmv1error "github.com/operator-framework/operator-controller/internal/action/error"
+	olmv1error "github.com/operator-framework/operator-controller/internal/operator-controller/action/error"
 )
 
 type ActionClientGetter struct {

internal/action/error/errors_test.go renamed to internal/operator-controller/action/error/errors_test.go

@@ -9,7 +9,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
-	"github.com/operator-framework/operator-controller/internal/authentication"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/authentication"
 )
 
 func ServiceAccountRestConfigMapper(tokenGetter *authentication.TokenGetter) func(ctx context.Context, o client.Object, c *rest.Config) (*rest.Config, error) {

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

@@ -24,10 +24,10 @@ import (
 	helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
-	"github.com/operator-framework/operator-controller/internal/features"
-	"github.com/operator-framework/operator-controller/internal/rukpak/convert"
-	"github.com/operator-framework/operator-controller/internal/rukpak/preflights/crdupgradesafety"
-	"github.com/operator-framework/operator-controller/internal/rukpak/util"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/features"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/convert"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/preflights/crdupgradesafety"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/util"
 )
 
 const (