diff --git a/api/v1/clusterextension_types_test.go b/api/v1/clusterextension_types_test.go index 297a15b13..f05427348 100644 --- a/api/v1/clusterextension_types_test.go +++ b/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) { diff --git a/catalogd/internal/source/containers_image.go b/catalogd/internal/source/containers_image.go index 64520955c..f4c736834 100644 --- a/catalogd/internal/source/containers_image.go +++ b/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" ) diff --git a/cmd/operator-controller/main.go b/cmd/operator-controller/main.go index 8f3fb170f..66017a0e0 100644 --- a/cmd/operator-controller/main.go +++ b/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" ) diff --git a/internal/action/error/errors.go b/internal/operator-controller/action/error/errors.go similarity index 100% rename from internal/action/error/errors.go rename to internal/operator-controller/action/error/errors.go diff --git a/internal/action/error/errors_test.go b/internal/operator-controller/action/error/errors_test.go similarity index 100% rename from internal/action/error/errors_test.go rename to internal/operator-controller/action/error/errors_test.go diff --git a/internal/action/helm.go b/internal/operator-controller/action/helm.go similarity index 98% rename from internal/action/helm.go rename to internal/operator-controller/action/helm.go index d54c469da..671a56b1b 100644 --- a/internal/action/helm.go +++ b/internal/operator-controller/action/helm.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 { diff --git a/internal/action/helm_test.go b/internal/operator-controller/action/helm_test.go similarity index 100% rename from internal/action/helm_test.go rename to internal/operator-controller/action/helm_test.go diff --git a/internal/action/restconfig.go b/internal/operator-controller/action/restconfig.go similarity index 90% rename from internal/action/restconfig.go rename to internal/operator-controller/action/restconfig.go index cca0b1fb3..6e0121281 100644 --- a/internal/action/restconfig.go +++ b/internal/operator-controller/action/restconfig.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) { diff --git a/internal/action/storagedriver.go b/internal/operator-controller/action/storagedriver.go similarity index 100% rename from internal/action/storagedriver.go rename to internal/operator-controller/action/storagedriver.go diff --git a/internal/applier/helm.go b/internal/operator-controller/applier/helm.go similarity index 94% rename from internal/applier/helm.go rename to internal/operator-controller/applier/helm.go index 1da49cad9..76df085cb 100644 --- a/internal/applier/helm.go +++ b/internal/operator-controller/applier/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 ( diff --git a/internal/applier/helm_test.go b/internal/operator-controller/applier/helm_test.go similarity index 98% rename from internal/applier/helm_test.go rename to internal/operator-controller/applier/helm_test.go index dd0bc2943..78d6629a5 100644 --- a/internal/applier/helm_test.go +++ b/internal/operator-controller/applier/helm_test.go @@ -19,8 +19,8 @@ import ( helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client" v1 "github.com/operator-framework/operator-controller/api/v1" - "github.com/operator-framework/operator-controller/internal/applier" - "github.com/operator-framework/operator-controller/internal/features" + "github.com/operator-framework/operator-controller/internal/operator-controller/applier" + "github.com/operator-framework/operator-controller/internal/operator-controller/features" ) type mockPreflight struct { diff --git a/internal/authentication/tokengetter.go b/internal/operator-controller/authentication/tokengetter.go similarity index 100% rename from internal/authentication/tokengetter.go rename to internal/operator-controller/authentication/tokengetter.go diff --git a/internal/authentication/tokengetter_test.go b/internal/operator-controller/authentication/tokengetter_test.go similarity index 100% rename from internal/authentication/tokengetter_test.go rename to internal/operator-controller/authentication/tokengetter_test.go diff --git a/internal/authentication/tripper.go b/internal/operator-controller/authentication/tripper.go similarity index 100% rename from internal/authentication/tripper.go rename to internal/operator-controller/authentication/tripper.go diff --git a/internal/bundleutil/bundle.go b/internal/operator-controller/bundleutil/bundle.go similarity index 100% rename from internal/bundleutil/bundle.go rename to internal/operator-controller/bundleutil/bundle.go diff --git a/internal/bundleutil/bundle_test.go b/internal/operator-controller/bundleutil/bundle_test.go similarity index 93% rename from internal/bundleutil/bundle_test.go rename to internal/operator-controller/bundleutil/bundle_test.go index 61ca0ea20..77b7e3bbe 100644 --- a/internal/bundleutil/bundle_test.go +++ b/internal/operator-controller/bundleutil/bundle_test.go @@ -9,7 +9,7 @@ import ( "github.com/operator-framework/operator-registry/alpha/declcfg" "github.com/operator-framework/operator-registry/alpha/property" - "github.com/operator-framework/operator-controller/internal/bundleutil" + "github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil" ) func TestGetVersion(t *testing.T) { diff --git a/internal/catalogmetadata/cache/cache.go b/internal/operator-controller/catalogmetadata/cache/cache.go similarity index 97% rename from internal/catalogmetadata/cache/cache.go rename to internal/operator-controller/catalogmetadata/cache/cache.go index 25a0a3379..8bcfff10f 100644 --- a/internal/catalogmetadata/cache/cache.go +++ b/internal/operator-controller/catalogmetadata/cache/cache.go @@ -10,7 +10,7 @@ import ( "github.com/operator-framework/operator-registry/alpha/declcfg" - "github.com/operator-framework/operator-controller/internal/catalogmetadata/client" + "github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/client" ) var _ client.Cache = &filesystemCache{} diff --git a/internal/catalogmetadata/cache/cache_test.go b/internal/operator-controller/catalogmetadata/cache/cache_test.go similarity index 98% rename from internal/catalogmetadata/cache/cache_test.go rename to internal/operator-controller/catalogmetadata/cache/cache_test.go index d1d52acf3..ccc796082 100644 --- a/internal/catalogmetadata/cache/cache_test.go +++ b/internal/operator-controller/catalogmetadata/cache/cache_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/util/sets" - "github.com/operator-framework/operator-controller/internal/catalogmetadata/cache" + "github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/cache" ) const ( diff --git a/internal/catalogmetadata/client/client.go b/internal/operator-controller/catalogmetadata/client/client.go similarity index 98% rename from internal/catalogmetadata/client/client.go rename to internal/operator-controller/catalogmetadata/client/client.go index a8e138763..6407b2acc 100644 --- a/internal/catalogmetadata/client/client.go +++ b/internal/operator-controller/catalogmetadata/client/client.go @@ -16,7 +16,7 @@ import ( "github.com/operator-framework/operator-registry/alpha/declcfg" catalogd "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" ) const ( diff --git a/internal/catalogmetadata/client/client_test.go b/internal/operator-controller/catalogmetadata/client/client_test.go similarity index 99% rename from internal/catalogmetadata/client/client_test.go rename to internal/operator-controller/catalogmetadata/client/client_test.go index 45228684a..fadb4c286 100644 --- a/internal/catalogmetadata/client/client_test.go +++ b/internal/operator-controller/catalogmetadata/client/client_test.go @@ -17,7 +17,7 @@ import ( "github.com/operator-framework/operator-registry/alpha/declcfg" catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1" - catalogClient "github.com/operator-framework/operator-controller/internal/catalogmetadata/client" + catalogClient "github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/client" ) func defaultCatalog() *catalogd.ClusterCatalog { diff --git a/internal/catalogmetadata/compare/compare.go b/internal/operator-controller/catalogmetadata/compare/compare.go similarity index 93% rename from internal/catalogmetadata/compare/compare.go rename to internal/operator-controller/catalogmetadata/compare/compare.go index 1b76d0cde..4c52eda4e 100644 --- a/internal/catalogmetadata/compare/compare.go +++ b/internal/operator-controller/catalogmetadata/compare/compare.go @@ -5,7 +5,7 @@ import ( "github.com/operator-framework/operator-registry/alpha/declcfg" - "github.com/operator-framework/operator-controller/internal/bundleutil" + "github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil" ) // ByVersion is a sort "less" function that orders bundles diff --git a/internal/catalogmetadata/compare/compare_test.go b/internal/operator-controller/catalogmetadata/compare/compare_test.go similarity index 95% rename from internal/catalogmetadata/compare/compare_test.go rename to internal/operator-controller/catalogmetadata/compare/compare_test.go index 095c879c1..c5d1735dc 100644 --- a/internal/catalogmetadata/compare/compare_test.go +++ b/internal/operator-controller/catalogmetadata/compare/compare_test.go @@ -10,7 +10,7 @@ import ( "github.com/operator-framework/operator-registry/alpha/declcfg" "github.com/operator-framework/operator-registry/alpha/property" - "github.com/operator-framework/operator-controller/internal/catalogmetadata/compare" + "github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/compare" ) func TestByVersion(t *testing.T) { diff --git a/internal/catalogmetadata/filter/bundle_predicates.go b/internal/operator-controller/catalogmetadata/filter/bundle_predicates.go similarity index 92% rename from internal/catalogmetadata/filter/bundle_predicates.go rename to internal/operator-controller/catalogmetadata/filter/bundle_predicates.go index 74e933daa..cd0b0e47c 100644 --- a/internal/catalogmetadata/filter/bundle_predicates.go +++ b/internal/operator-controller/catalogmetadata/filter/bundle_predicates.go @@ -5,7 +5,7 @@ import ( "github.com/operator-framework/operator-registry/alpha/declcfg" - "github.com/operator-framework/operator-controller/internal/bundleutil" + "github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil" "github.com/operator-framework/operator-controller/internal/util/filter" ) diff --git a/internal/catalogmetadata/filter/bundle_predicates_test.go b/internal/operator-controller/catalogmetadata/filter/bundle_predicates_test.go similarity index 94% rename from internal/catalogmetadata/filter/bundle_predicates_test.go rename to internal/operator-controller/catalogmetadata/filter/bundle_predicates_test.go index beb2950f1..da47b961f 100644 --- a/internal/catalogmetadata/filter/bundle_predicates_test.go +++ b/internal/operator-controller/catalogmetadata/filter/bundle_predicates_test.go @@ -11,7 +11,7 @@ import ( "github.com/operator-framework/operator-registry/alpha/declcfg" "github.com/operator-framework/operator-registry/alpha/property" - "github.com/operator-framework/operator-controller/internal/catalogmetadata/filter" + "github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/filter" ) func TestInMastermindsSemverRange(t *testing.T) { diff --git a/internal/catalogmetadata/filter/successors.go b/internal/operator-controller/catalogmetadata/filter/successors.go similarity index 100% rename from internal/catalogmetadata/filter/successors.go rename to internal/operator-controller/catalogmetadata/filter/successors.go diff --git a/internal/catalogmetadata/filter/successors_test.go b/internal/operator-controller/catalogmetadata/filter/successors_test.go similarity index 96% rename from internal/catalogmetadata/filter/successors_test.go rename to internal/operator-controller/catalogmetadata/filter/successors_test.go index ab3beff7c..abe15870d 100644 --- a/internal/catalogmetadata/filter/successors_test.go +++ b/internal/operator-controller/catalogmetadata/filter/successors_test.go @@ -14,8 +14,8 @@ import ( "github.com/operator-framework/operator-registry/alpha/property" ocv1 "github.com/operator-framework/operator-controller/api/v1" - "github.com/operator-framework/operator-controller/internal/bundleutil" - "github.com/operator-framework/operator-controller/internal/catalogmetadata/compare" + "github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil" + "github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/compare" "github.com/operator-framework/operator-controller/internal/util/filter" ) diff --git a/internal/conditionsets/conditionsets.go b/internal/operator-controller/conditionsets/conditionsets.go similarity index 100% rename from internal/conditionsets/conditionsets.go rename to internal/operator-controller/conditionsets/conditionsets.go diff --git a/internal/contentmanager/cache/cache.go b/internal/operator-controller/contentmanager/cache/cache.go similarity index 100% rename from internal/contentmanager/cache/cache.go rename to internal/operator-controller/contentmanager/cache/cache.go diff --git a/internal/contentmanager/cache/cache_test.go b/internal/operator-controller/contentmanager/cache/cache_test.go similarity index 100% rename from internal/contentmanager/cache/cache_test.go rename to internal/operator-controller/contentmanager/cache/cache_test.go diff --git a/internal/contentmanager/contentmanager.go b/internal/operator-controller/contentmanager/contentmanager.go similarity index 96% rename from internal/contentmanager/contentmanager.go rename to internal/operator-controller/contentmanager/contentmanager.go index 4324ba0c4..2ac03b0d3 100644 --- a/internal/contentmanager/contentmanager.go +++ b/internal/operator-controller/contentmanager/contentmanager.go @@ -14,9 +14,9 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/operator-framework/operator-controller/api/v1" - cmcache "github.com/operator-framework/operator-controller/internal/contentmanager/cache" - oclabels "github.com/operator-framework/operator-controller/internal/labels" + v1 "github.com/operator-framework/operator-controller/api/v1" + cmcache "github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager/cache" + oclabels "github.com/operator-framework/operator-controller/internal/operator-controller/labels" ) // Manager is a utility to manage content caches belonging diff --git a/internal/contentmanager/source/dynamicsource.go b/internal/operator-controller/contentmanager/source/dynamicsource.go similarity index 99% rename from internal/contentmanager/source/dynamicsource.go rename to internal/operator-controller/contentmanager/source/dynamicsource.go index c7c7b3bd5..dc252492c 100644 --- a/internal/contentmanager/source/dynamicsource.go +++ b/internal/operator-controller/contentmanager/source/dynamicsource.go @@ -18,7 +18,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - source "github.com/operator-framework/operator-controller/internal/contentmanager/source/internal" + source "github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager/source/internal" ) type DynamicSourceConfig struct { diff --git a/internal/contentmanager/source/dynamicsource_test.go b/internal/operator-controller/contentmanager/source/dynamicsource_test.go similarity index 100% rename from internal/contentmanager/source/dynamicsource_test.go rename to internal/operator-controller/contentmanager/source/dynamicsource_test.go diff --git a/internal/contentmanager/source/internal/eventhandler.go b/internal/operator-controller/contentmanager/source/internal/eventhandler.go similarity index 100% rename from internal/contentmanager/source/internal/eventhandler.go rename to internal/operator-controller/contentmanager/source/internal/eventhandler.go diff --git a/internal/contentmanager/sourcerer.go b/internal/operator-controller/contentmanager/sourcerer.go similarity index 92% rename from internal/contentmanager/sourcerer.go rename to internal/operator-controller/contentmanager/sourcerer.go index 4f6c82468..ce0545621 100644 --- a/internal/contentmanager/sourcerer.go +++ b/internal/operator-controller/contentmanager/sourcerer.go @@ -15,9 +15,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/predicate" - "github.com/operator-framework/operator-controller/api/v1" - "github.com/operator-framework/operator-controller/internal/contentmanager/cache" - "github.com/operator-framework/operator-controller/internal/contentmanager/source" + v1 "github.com/operator-framework/operator-controller/api/v1" + "github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager/cache" + "github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager/source" ) type dynamicSourcerer struct { diff --git a/internal/controllers/clustercatalog_controller.go b/internal/operator-controller/controllers/clustercatalog_controller.go similarity index 100% rename from internal/controllers/clustercatalog_controller.go rename to internal/operator-controller/controllers/clustercatalog_controller.go diff --git a/internal/controllers/clustercatalog_controller_test.go b/internal/operator-controller/controllers/clustercatalog_controller_test.go similarity index 97% rename from internal/controllers/clustercatalog_controller_test.go rename to internal/operator-controller/controllers/clustercatalog_controller_test.go index 92cbbe269..befe036e5 100644 --- a/internal/controllers/clustercatalog_controller_test.go +++ b/internal/operator-controller/controllers/clustercatalog_controller_test.go @@ -15,8 +15,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1" - "github.com/operator-framework/operator-controller/internal/controllers" - "github.com/operator-framework/operator-controller/internal/scheme" + "github.com/operator-framework/operator-controller/internal/operator-controller/controllers" + "github.com/operator-framework/operator-controller/internal/operator-controller/scheme" ) func TestClusterCatalogReconcilerFinalizers(t *testing.T) { diff --git a/internal/controllers/clusterextension_admission_test.go b/internal/operator-controller/controllers/clusterextension_admission_test.go similarity index 100% rename from internal/controllers/clusterextension_admission_test.go rename to internal/operator-controller/controllers/clusterextension_admission_test.go diff --git a/internal/controllers/clusterextension_controller.go b/internal/operator-controller/controllers/clusterextension_controller.go similarity index 97% rename from internal/controllers/clusterextension_controller.go rename to internal/operator-controller/controllers/clusterextension_controller.go index 9353790db..5b8a56211 100644 --- a/internal/controllers/clusterextension_controller.go +++ b/internal/operator-controller/controllers/clusterextension_controller.go @@ -50,13 +50,13 @@ 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/authentication" - "github.com/operator-framework/operator-controller/internal/bundleutil" - "github.com/operator-framework/operator-controller/internal/conditionsets" - "github.com/operator-framework/operator-controller/internal/contentmanager" - "github.com/operator-framework/operator-controller/internal/labels" - "github.com/operator-framework/operator-controller/internal/resolve" - rukpaksource "github.com/operator-framework/operator-controller/internal/rukpak/source" + "github.com/operator-framework/operator-controller/internal/operator-controller/authentication" + "github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil" + "github.com/operator-framework/operator-controller/internal/operator-controller/conditionsets" + "github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager" + "github.com/operator-framework/operator-controller/internal/operator-controller/labels" + "github.com/operator-framework/operator-controller/internal/operator-controller/resolve" + rukpaksource "github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/source" ) const ( diff --git a/internal/controllers/clusterextension_controller_test.go b/internal/operator-controller/controllers/clusterextension_controller_test.go similarity index 98% rename from internal/controllers/clusterextension_controller_test.go rename to internal/operator-controller/controllers/clusterextension_controller_test.go index a1bb8db41..34fa36c59 100644 --- a/internal/controllers/clusterextension_controller_test.go +++ b/internal/operator-controller/controllers/clusterextension_controller_test.go @@ -28,13 +28,13 @@ import ( "github.com/operator-framework/operator-registry/alpha/declcfg" ocv1 "github.com/operator-framework/operator-controller/api/v1" - "github.com/operator-framework/operator-controller/internal/authentication" - "github.com/operator-framework/operator-controller/internal/conditionsets" - "github.com/operator-framework/operator-controller/internal/controllers" - "github.com/operator-framework/operator-controller/internal/finalizers" - "github.com/operator-framework/operator-controller/internal/labels" - "github.com/operator-framework/operator-controller/internal/resolve" - "github.com/operator-framework/operator-controller/internal/rukpak/source" + "github.com/operator-framework/operator-controller/internal/operator-controller/authentication" + "github.com/operator-framework/operator-controller/internal/operator-controller/conditionsets" + "github.com/operator-framework/operator-controller/internal/operator-controller/controllers" + "github.com/operator-framework/operator-controller/internal/operator-controller/finalizers" + "github.com/operator-framework/operator-controller/internal/operator-controller/labels" + "github.com/operator-framework/operator-controller/internal/operator-controller/resolve" + "github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/source" ) // Describe: ClusterExtension Controller Test diff --git a/internal/controllers/common_controller.go b/internal/operator-controller/controllers/common_controller.go similarity index 100% rename from internal/controllers/common_controller.go rename to internal/operator-controller/controllers/common_controller.go diff --git a/internal/controllers/common_controller_test.go b/internal/operator-controller/controllers/common_controller_test.go similarity index 100% rename from internal/controllers/common_controller_test.go rename to internal/operator-controller/controllers/common_controller_test.go diff --git a/internal/controllers/pull_secret_controller.go b/internal/operator-controller/controllers/pull_secret_controller.go similarity index 100% rename from internal/controllers/pull_secret_controller.go rename to internal/operator-controller/controllers/pull_secret_controller.go diff --git a/internal/controllers/pull_secret_controller_test.go b/internal/operator-controller/controllers/pull_secret_controller_test.go similarity index 93% rename from internal/controllers/pull_secret_controller_test.go rename to internal/operator-controller/controllers/pull_secret_controller_test.go index dc240e762..4406ffa2f 100644 --- a/internal/controllers/pull_secret_controller_test.go +++ b/internal/operator-controller/controllers/pull_secret_controller_test.go @@ -13,8 +13,8 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/operator-framework/operator-controller/internal/controllers" - "github.com/operator-framework/operator-controller/internal/scheme" + "github.com/operator-framework/operator-controller/internal/operator-controller/controllers" + "github.com/operator-framework/operator-controller/internal/operator-controller/scheme" ) func TestSecretSyncerReconciler(t *testing.T) { diff --git a/internal/controllers/suite_test.go b/internal/operator-controller/controllers/suite_test.go similarity index 93% rename from internal/controllers/suite_test.go rename to internal/operator-controller/controllers/suite_test.go index 41b3c8d8d..669f6a94f 100644 --- a/internal/controllers/suite_test.go +++ b/internal/operator-controller/controllers/suite_test.go @@ -36,10 +36,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/contentmanager" - cmcache "github.com/operator-framework/operator-controller/internal/contentmanager/cache" - "github.com/operator-framework/operator-controller/internal/controllers" - "github.com/operator-framework/operator-controller/internal/rukpak/source" + "github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager" + cmcache "github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager/cache" + "github.com/operator-framework/operator-controller/internal/operator-controller/controllers" + "github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/source" ) // MockUnpacker is a mock of Unpacker interface @@ -158,7 +158,7 @@ var ( func TestMain(m *testing.M) { testEnv := &envtest.Environment{ CRDDirectoryPaths: []string{ - filepath.Join("..", "..", "config", "base", "crd", "bases"), + filepath.Join("..", "..", "..", "config", "base", "crd", "bases"), }, ErrorIfCRDPathMissing: true, } diff --git a/internal/features/features.go b/internal/operator-controller/features/features.go similarity index 100% rename from internal/features/features.go rename to internal/operator-controller/features/features.go diff --git a/internal/finalizers/finalizers.go b/internal/operator-controller/finalizers/finalizers.go similarity index 100% rename from internal/finalizers/finalizers.go rename to internal/operator-controller/finalizers/finalizers.go diff --git a/internal/httputil/certlog.go b/internal/operator-controller/httputil/certlog.go similarity index 100% rename from internal/httputil/certlog.go rename to internal/operator-controller/httputil/certlog.go diff --git a/internal/httputil/certpoolwatcher.go b/internal/operator-controller/httputil/certpoolwatcher.go similarity index 100% rename from internal/httputil/certpoolwatcher.go rename to internal/operator-controller/httputil/certpoolwatcher.go diff --git a/internal/httputil/certpoolwatcher_test.go b/internal/operator-controller/httputil/certpoolwatcher_test.go similarity index 96% rename from internal/httputil/certpoolwatcher_test.go rename to internal/operator-controller/httputil/certpoolwatcher_test.go index 2ea3f862a..0a5c2974b 100644 --- a/internal/httputil/certpoolwatcher_test.go +++ b/internal/operator-controller/httputil/certpoolwatcher_test.go @@ -17,7 +17,7 @@ import ( "github.com/stretchr/testify/require" "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/operator-framework/operator-controller/internal/httputil" + "github.com/operator-framework/operator-controller/internal/operator-controller/httputil" ) func createCert(t *testing.T, name string) { diff --git a/internal/httputil/certutil.go b/internal/operator-controller/httputil/certutil.go similarity index 100% rename from internal/httputil/certutil.go rename to internal/operator-controller/httputil/certutil.go diff --git a/internal/httputil/certutil_test.go b/internal/operator-controller/httputil/certutil_test.go similarity index 70% rename from internal/httputil/certutil_test.go rename to internal/operator-controller/httputil/certutil_test.go index f6489ab99..d37383c90 100644 --- a/internal/httputil/certutil_test.go +++ b/internal/operator-controller/httputil/certutil_test.go @@ -7,7 +7,7 @@ import ( "github.com/go-logr/logr" "github.com/stretchr/testify/require" - "github.com/operator-framework/operator-controller/internal/httputil" + "github.com/operator-framework/operator-controller/internal/operator-controller/httputil" ) // 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) { dir string msg string }{ - {"../../testdata/certs/", `no certificates found in "../../testdata/certs/"`}, - {"../../testdata/certs/good", ""}, - {"../../testdata/certs/empty", `no certificates found in "../../testdata/certs/empty"`}, + {"../../../testdata/certs/", `no certificates found in "../../../testdata/certs/"`}, + {"../../../testdata/certs/good", ""}, + {"../../../testdata/certs/empty", `no certificates found in "../../../testdata/certs/empty"`}, } log, _ := logr.FromContext(context.Background()) diff --git a/internal/httputil/httputil.go b/internal/operator-controller/httputil/httputil.go similarity index 100% rename from internal/httputil/httputil.go rename to internal/operator-controller/httputil/httputil.go diff --git a/internal/labels/labels.go b/internal/operator-controller/labels/labels.go similarity index 100% rename from internal/labels/labels.go rename to internal/operator-controller/labels/labels.go diff --git a/internal/resolve/catalog.go b/internal/operator-controller/resolve/catalog.go similarity index 97% rename from internal/resolve/catalog.go rename to internal/operator-controller/resolve/catalog.go index 85a404cac..095be8b10 100644 --- a/internal/resolve/catalog.go +++ b/internal/operator-controller/resolve/catalog.go @@ -19,9 +19,9 @@ 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/bundleutil" - "github.com/operator-framework/operator-controller/internal/catalogmetadata/compare" - "github.com/operator-framework/operator-controller/internal/catalogmetadata/filter" + "github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil" + "github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/compare" + "github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/filter" filterutil "github.com/operator-framework/operator-controller/internal/util/filter" ) diff --git a/internal/resolve/catalog_test.go b/internal/operator-controller/resolve/catalog_test.go similarity index 100% rename from internal/resolve/catalog_test.go rename to internal/operator-controller/resolve/catalog_test.go diff --git a/internal/resolve/resolver.go b/internal/operator-controller/resolve/resolver.go similarity index 100% rename from internal/resolve/resolver.go rename to internal/operator-controller/resolve/resolver.go diff --git a/internal/resolve/validation.go b/internal/operator-controller/resolve/validation.go similarity index 100% rename from internal/resolve/validation.go rename to internal/operator-controller/resolve/validation.go diff --git a/internal/resolve/validation_test.go b/internal/operator-controller/resolve/validation_test.go similarity index 100% rename from internal/resolve/validation_test.go rename to internal/operator-controller/resolve/validation_test.go diff --git a/internal/rukpak/convert/registryv1.go b/internal/operator-controller/rukpak/convert/registryv1.go similarity index 99% rename from internal/rukpak/convert/registryv1.go rename to internal/operator-controller/rukpak/convert/registryv1.go index c26d16161..0bbc7dfaa 100644 --- a/internal/rukpak/convert/registryv1.go +++ b/internal/operator-controller/rukpak/convert/registryv1.go @@ -27,8 +27,8 @@ import ( "github.com/operator-framework/operator-registry/alpha/property" registrybundle "github.com/operator-framework/operator-registry/pkg/lib/bundle" - registry "github.com/operator-framework/operator-controller/internal/rukpak/operator-registry" - "github.com/operator-framework/operator-controller/internal/rukpak/util" + registry "github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/operator-registry" + "github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/util" ) type RegistryV1 struct { diff --git a/internal/rukpak/convert/registryv1_test.go b/internal/operator-controller/rukpak/convert/registryv1_test.go similarity index 100% rename from internal/rukpak/convert/registryv1_test.go rename to internal/operator-controller/rukpak/convert/registryv1_test.go diff --git a/internal/rukpak/convert/testdata/combine-properties-bundle/manifests/csv.yaml b/internal/operator-controller/rukpak/convert/testdata/combine-properties-bundle/manifests/csv.yaml similarity index 100% rename from internal/rukpak/convert/testdata/combine-properties-bundle/manifests/csv.yaml rename to internal/operator-controller/rukpak/convert/testdata/combine-properties-bundle/manifests/csv.yaml diff --git a/internal/rukpak/convert/testdata/combine-properties-bundle/metadata/annotations.yaml b/internal/operator-controller/rukpak/convert/testdata/combine-properties-bundle/metadata/annotations.yaml similarity index 100% rename from internal/rukpak/convert/testdata/combine-properties-bundle/metadata/annotations.yaml rename to internal/operator-controller/rukpak/convert/testdata/combine-properties-bundle/metadata/annotations.yaml diff --git a/internal/rukpak/convert/testdata/combine-properties-bundle/metadata/properties.yaml b/internal/operator-controller/rukpak/convert/testdata/combine-properties-bundle/metadata/properties.yaml similarity index 100% rename from internal/rukpak/convert/testdata/combine-properties-bundle/metadata/properties.yaml rename to internal/operator-controller/rukpak/convert/testdata/combine-properties-bundle/metadata/properties.yaml diff --git a/internal/rukpak/operator-registry/registry.go b/internal/operator-controller/rukpak/operator-registry/registry.go similarity index 100% rename from internal/rukpak/operator-registry/registry.go rename to internal/operator-controller/rukpak/operator-registry/registry.go diff --git a/internal/rukpak/preflights/crdupgradesafety/checks.go b/internal/operator-controller/rukpak/preflights/crdupgradesafety/checks.go similarity index 100% rename from internal/rukpak/preflights/crdupgradesafety/checks.go rename to internal/operator-controller/rukpak/preflights/crdupgradesafety/checks.go diff --git a/internal/rukpak/preflights/crdupgradesafety/checks_test.go b/internal/operator-controller/rukpak/preflights/crdupgradesafety/checks_test.go similarity index 100% rename from internal/rukpak/preflights/crdupgradesafety/checks_test.go rename to internal/operator-controller/rukpak/preflights/crdupgradesafety/checks_test.go diff --git a/internal/rukpak/preflights/crdupgradesafety/crdupgradesafety.go b/internal/operator-controller/rukpak/preflights/crdupgradesafety/crdupgradesafety.go similarity index 98% rename from internal/rukpak/preflights/crdupgradesafety/crdupgradesafety.go rename to internal/operator-controller/rukpak/preflights/crdupgradesafety/crdupgradesafety.go index 2599cedda..0577c38b3 100644 --- a/internal/rukpak/preflights/crdupgradesafety/crdupgradesafety.go +++ b/internal/operator-controller/rukpak/preflights/crdupgradesafety/crdupgradesafety.go @@ -16,7 +16,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/operator-framework/operator-controller/internal/rukpak/util" + "github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/util" ) type Option func(p *Preflight) diff --git a/internal/rukpak/preflights/crdupgradesafety/crdupgradesafety_test.go b/internal/operator-controller/rukpak/preflights/crdupgradesafety/crdupgradesafety_test.go similarity index 97% rename from internal/rukpak/preflights/crdupgradesafety/crdupgradesafety_test.go rename to internal/operator-controller/rukpak/preflights/crdupgradesafety/crdupgradesafety_test.go index 98b2289bd..47e9d951b 100644 --- a/internal/rukpak/preflights/crdupgradesafety/crdupgradesafety_test.go +++ b/internal/operator-controller/rukpak/preflights/crdupgradesafety/crdupgradesafety_test.go @@ -17,8 +17,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "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/rukpak/preflights/crdupgradesafety" + "github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/util" ) type MockCRDGetter struct { @@ -42,7 +42,7 @@ func newMockPreflight(crd *apiextensionsv1.CustomResourceDefinition, err error, }, preflightOpts...) } -const crdFolder string = "../../../../testdata/manifests" +const crdFolder string = "../../../../../testdata/manifests" func getCrdFromManifestFile(t *testing.T, oldCrdFile string) *apiextensionsv1.CustomResourceDefinition { if oldCrdFile == "" { diff --git a/internal/rukpak/source/containers_image.go b/internal/operator-controller/rukpak/source/containers_image.go similarity index 99% rename from internal/rukpak/source/containers_image.go rename to internal/operator-controller/rukpak/source/containers_image.go index 08d353f5b..e0bb408ab 100644 --- a/internal/rukpak/source/containers_image.go +++ b/internal/operator-controller/rukpak/source/containers_image.go @@ -20,7 +20,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "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" ) diff --git a/internal/rukpak/source/containers_image_test.go b/internal/operator-controller/rukpak/source/containers_image_test.go similarity index 99% rename from internal/rukpak/source/containers_image_test.go rename to internal/operator-controller/rukpak/source/containers_image_test.go index c8639dd78..9cd255b97 100644 --- a/internal/rukpak/source/containers_image_test.go +++ b/internal/operator-controller/rukpak/source/containers_image_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/operator-framework/operator-controller/internal/rukpak/source" + "github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/source" fsutil "github.com/operator-framework/operator-controller/internal/util/fs" ) diff --git a/internal/rukpak/source/unpacker.go b/internal/operator-controller/rukpak/source/unpacker.go similarity index 100% rename from internal/rukpak/source/unpacker.go rename to internal/operator-controller/rukpak/source/unpacker.go diff --git a/internal/rukpak/util/hash.go b/internal/operator-controller/rukpak/util/hash.go similarity index 100% rename from internal/rukpak/util/hash.go rename to internal/operator-controller/rukpak/util/hash.go diff --git a/internal/rukpak/util/hash_test.go b/internal/operator-controller/rukpak/util/hash_test.go similarity index 96% rename from internal/rukpak/util/hash_test.go rename to internal/operator-controller/rukpak/util/hash_test.go index 3273793f7..9d16dfd64 100644 --- a/internal/rukpak/util/hash_test.go +++ b/internal/operator-controller/rukpak/util/hash_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/operator-framework/operator-controller/internal/rukpak/util" + "github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/util" ) func TestDeepHashObject(t *testing.T) { diff --git a/internal/rukpak/util/util.go b/internal/operator-controller/rukpak/util/util.go similarity index 100% rename from internal/rukpak/util/util.go rename to internal/operator-controller/rukpak/util/util.go diff --git a/internal/rukpak/util/util_test.go b/internal/operator-controller/rukpak/util/util_test.go similarity index 97% rename from internal/rukpak/util/util_test.go rename to internal/operator-controller/rukpak/util/util_test.go index 5a076ed6a..8ccb4b74e 100644 --- a/internal/rukpak/util/util_test.go +++ b/internal/operator-controller/rukpak/util/util_test.go @@ -13,7 +13,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/operator-framework/operator-controller/internal/rukpak/util" + "github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/util" ) func TestMergeMaps(t *testing.T) { diff --git a/internal/scheme/scheme.go b/internal/operator-controller/scheme/scheme.go similarity index 100% rename from internal/scheme/scheme.go rename to internal/operator-controller/scheme/scheme.go diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index e65fd5e5d..3e8c4dfa1 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1" - "github.com/operator-framework/operator-controller/internal/scheme" + "github.com/operator-framework/operator-controller/internal/operator-controller/scheme" ) var ( diff --git a/test/upgrade-e2e/upgrade_e2e_suite_test.go b/test/upgrade-e2e/upgrade_e2e_suite_test.go index 7c003b6e4..a2acee4cd 100644 --- a/test/upgrade-e2e/upgrade_e2e_suite_test.go +++ b/test/upgrade-e2e/upgrade_e2e_suite_test.go @@ -10,7 +10,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/operator-framework/operator-controller/internal/scheme" + "github.com/operator-framework/operator-controller/internal/operator-controller/scheme" ) const (