diff --git a/cmd/core/main.go b/cmd/core/main.go index 414bd044..3badffa2 100644 --- a/cmd/core/main.go +++ b/cmd/core/main.go @@ -49,11 +49,11 @@ import ( "github.com/operator-framework/rukpak/internal/finalizer" "github.com/operator-framework/rukpak/internal/provisioner/plain" "github.com/operator-framework/rukpak/internal/provisioner/registry" - "github.com/operator-framework/rukpak/internal/source" - "github.com/operator-framework/rukpak/internal/storage" - "github.com/operator-framework/rukpak/internal/util" "github.com/operator-framework/rukpak/internal/version" "github.com/operator-framework/rukpak/pkg/features" + "github.com/operator-framework/rukpak/pkg/source" + "github.com/operator-framework/rukpak/pkg/storage" + "github.com/operator-framework/rukpak/pkg/util" ) var ( diff --git a/cmd/helm/main.go b/cmd/helm/main.go index e59387e2..50b7de67 100644 --- a/cmd/helm/main.go +++ b/cmd/helm/main.go @@ -44,10 +44,10 @@ import ( "github.com/operator-framework/rukpak/internal/controllers/bundledeployment" "github.com/operator-framework/rukpak/internal/finalizer" "github.com/operator-framework/rukpak/internal/provisioner/helm" - "github.com/operator-framework/rukpak/internal/source" - "github.com/operator-framework/rukpak/internal/storage" - "github.com/operator-framework/rukpak/internal/util" "github.com/operator-framework/rukpak/internal/version" + "github.com/operator-framework/rukpak/pkg/source" + "github.com/operator-framework/rukpak/pkg/storage" + "github.com/operator-framework/rukpak/pkg/util" ) var ( diff --git a/cmd/webhooks/main.go b/cmd/webhooks/main.go index 5c485f97..70cf4c3a 100644 --- a/cmd/webhooks/main.go +++ b/cmd/webhooks/main.go @@ -33,9 +33,9 @@ import ( crwebhook "sigs.k8s.io/controller-runtime/pkg/webhook" rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2" - "github.com/operator-framework/rukpak/internal/util" "github.com/operator-framework/rukpak/internal/version" "github.com/operator-framework/rukpak/internal/webhook" + "github.com/operator-framework/rukpak/pkg/util" ) var ( diff --git a/internal/controllers/bundledeployment/bundledeployment.go b/internal/controllers/bundledeployment/bundledeployment.go index 3e54a014..3de4456c 100644 --- a/internal/controllers/bundledeployment/bundledeployment.go +++ b/internal/controllers/bundledeployment/bundledeployment.go @@ -41,10 +41,10 @@ import ( rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2" "github.com/operator-framework/rukpak/internal/healthchecks" helmpredicate "github.com/operator-framework/rukpak/internal/helm-operator-plugins/predicate" - unpackersource "github.com/operator-framework/rukpak/internal/source" - "github.com/operator-framework/rukpak/internal/storage" - "github.com/operator-framework/rukpak/internal/util" "github.com/operator-framework/rukpak/pkg/features" + unpackersource "github.com/operator-framework/rukpak/pkg/source" + "github.com/operator-framework/rukpak/pkg/storage" + "github.com/operator-framework/rukpak/pkg/util" ) /* diff --git a/internal/controllers/bundledeployment/bundledeployment_test.go b/internal/controllers/bundledeployment/bundledeployment_test.go index 36fae329..03dcd332 100644 --- a/internal/controllers/bundledeployment/bundledeployment_test.go +++ b/internal/controllers/bundledeployment/bundledeployment_test.go @@ -14,7 +14,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2" - "github.com/operator-framework/rukpak/internal/util" + "github.com/operator-framework/rukpak/pkg/util" ) func TestBundleDeploymentController(t *testing.T) { diff --git a/internal/finalizer/deletecachedbundle.go b/internal/finalizer/deletecachedbundle.go index 7dec9d67..b8a0d775 100644 --- a/internal/finalizer/deletecachedbundle.go +++ b/internal/finalizer/deletecachedbundle.go @@ -6,7 +6,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/finalizer" - "github.com/operator-framework/rukpak/internal/storage" + "github.com/operator-framework/rukpak/pkg/storage" ) var _ finalizer.Finalizer = &DeleteCachedBundle{} diff --git a/internal/provisioner/helm/helm.go b/internal/provisioner/helm/helm.go index 2377322c..8eff04c0 100644 --- a/internal/provisioner/helm/helm.go +++ b/internal/provisioner/helm/helm.go @@ -13,7 +13,7 @@ import ( "helm.sh/helm/v3/pkg/chartutil" rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2" - "github.com/operator-framework/rukpak/internal/util" + "github.com/operator-framework/rukpak/pkg/util" ) const ( diff --git a/internal/provisioner/plain/plain.go b/internal/provisioner/plain/plain.go index 2ab9c2ed..5b3dcc0b 100644 --- a/internal/provisioner/plain/plain.go +++ b/internal/provisioner/plain/plain.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/yaml" rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2" - "github.com/operator-framework/rukpak/internal/util" + "github.com/operator-framework/rukpak/pkg/util" ) const ( diff --git a/internal/provisioner/registry/registry.go b/internal/provisioner/registry/registry.go index 4db3e6ec..572e8385 100644 --- a/internal/provisioner/registry/registry.go +++ b/internal/provisioner/registry/registry.go @@ -10,8 +10,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2" - "github.com/operator-framework/rukpak/internal/convert" "github.com/operator-framework/rukpak/internal/provisioner/plain" + "github.com/operator-framework/rukpak/pkg/convert" ) const ( diff --git a/internal/convert/registryv1.go b/pkg/convert/registryv1.go similarity index 99% rename from internal/convert/registryv1.go rename to pkg/convert/registryv1.go index 2d995e51..2d5ebe8e 100644 --- a/internal/convert/registryv1.go +++ b/pkg/convert/registryv1.go @@ -27,7 +27,7 @@ import ( registrybundle "github.com/operator-framework/operator-registry/pkg/lib/bundle" registry "github.com/operator-framework/rukpak/internal/operator-registry" - "github.com/operator-framework/rukpak/internal/util" + "github.com/operator-framework/rukpak/pkg/util" ) type RegistryV1 struct { diff --git a/internal/convert/registryv1_test.go b/pkg/convert/registryv1_test.go similarity index 100% rename from internal/convert/registryv1_test.go rename to pkg/convert/registryv1_test.go diff --git a/internal/source/common.go b/pkg/source/common.go similarity index 100% rename from internal/source/common.go rename to pkg/source/common.go diff --git a/internal/source/configmaps.go b/pkg/source/configmaps.go similarity index 100% rename from internal/source/configmaps.go rename to pkg/source/configmaps.go diff --git a/internal/source/git.go b/pkg/source/git.go similarity index 100% rename from internal/source/git.go rename to pkg/source/git.go diff --git a/internal/source/http.go b/pkg/source/http.go similarity index 100% rename from internal/source/http.go rename to pkg/source/http.go diff --git a/internal/source/image.go b/pkg/source/image.go similarity index 99% rename from internal/source/image.go rename to pkg/source/image.go index 80eaa195..07f91898 100644 --- a/internal/source/image.go +++ b/pkg/source/image.go @@ -22,7 +22,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2" - "github.com/operator-framework/rukpak/internal/util" + "github.com/operator-framework/rukpak/pkg/util" ) type Image struct { diff --git a/internal/source/unpacker.go b/pkg/source/unpacker.go similarity index 100% rename from internal/source/unpacker.go rename to pkg/source/unpacker.go diff --git a/internal/storage/http.go b/pkg/storage/http.go similarity index 100% rename from internal/storage/http.go rename to pkg/storage/http.go diff --git a/internal/storage/http_test.go b/pkg/storage/http_test.go similarity index 99% rename from internal/storage/http_test.go rename to pkg/storage/http_test.go index 97b5b5c2..abe053a4 100644 --- a/internal/storage/http_test.go +++ b/pkg/storage/http_test.go @@ -19,7 +19,7 @@ import ( "k8s.io/apimachinery/pkg/util/rand" rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2" - "github.com/operator-framework/rukpak/internal/util" + "github.com/operator-framework/rukpak/pkg/util" ) var _ = Describe("HTTP", func() { diff --git a/internal/storage/localdir.go b/pkg/storage/localdir.go similarity index 97% rename from internal/storage/localdir.go rename to pkg/storage/localdir.go index 2ad9b295..07a7e9c9 100644 --- a/internal/storage/localdir.go +++ b/pkg/storage/localdir.go @@ -16,7 +16,7 @@ import ( "github.com/nlepage/go-tarfs" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/operator-framework/rukpak/internal/util" + "github.com/operator-framework/rukpak/pkg/util" ) var _ Storage = &LocalDirectory{} diff --git a/internal/storage/localdir_test.go b/pkg/storage/localdir_test.go similarity index 100% rename from internal/storage/localdir_test.go rename to pkg/storage/localdir_test.go diff --git a/internal/storage/storage.go b/pkg/storage/storage.go similarity index 100% rename from internal/storage/storage.go rename to pkg/storage/storage.go diff --git a/internal/storage/storage_suite_test.go b/pkg/storage/storage_suite_test.go similarity index 100% rename from internal/storage/storage_suite_test.go rename to pkg/storage/storage_suite_test.go diff --git a/internal/storage/storage_test.go b/pkg/storage/storage_test.go similarity index 97% rename from internal/storage/storage_test.go rename to pkg/storage/storage_test.go index 66760ace..84931641 100644 --- a/internal/storage/storage_test.go +++ b/pkg/storage/storage_test.go @@ -15,7 +15,7 @@ import ( "k8s.io/apimachinery/pkg/util/rand" rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2" - "github.com/operator-framework/rukpak/internal/util" + "github.com/operator-framework/rukpak/pkg/util" ) var _ = Describe("WithFallbackLoader", func() { diff --git a/internal/util/defaults.go b/pkg/util/defaults.go similarity index 100% rename from internal/util/defaults.go rename to pkg/util/defaults.go diff --git a/internal/util/fs.go b/pkg/util/fs.go similarity index 100% rename from internal/util/fs.go rename to pkg/util/fs.go diff --git a/internal/util/hash.go b/pkg/util/hash.go similarity index 100% rename from internal/util/hash.go rename to pkg/util/hash.go diff --git a/internal/util/labels.go b/pkg/util/labels.go similarity index 100% rename from internal/util/labels.go rename to pkg/util/labels.go diff --git a/internal/util/tar.go b/pkg/util/tar.go similarity index 100% rename from internal/util/tar.go rename to pkg/util/tar.go diff --git a/internal/util/util.go b/pkg/util/util.go similarity index 100% rename from internal/util/util.go rename to pkg/util/util.go diff --git a/test/e2e/crdvalidator_test.go b/test/e2e/crdvalidator_test.go index 887cb01c..8c63801f 100644 --- a/test/e2e/crdvalidator_test.go +++ b/test/e2e/crdvalidator_test.go @@ -11,7 +11,7 @@ import ( rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2" "github.com/operator-framework/rukpak/cmd/crdvalidator/annotation" - "github.com/operator-framework/rukpak/internal/util" + "github.com/operator-framework/rukpak/pkg/util" "github.com/operator-framework/rukpak/test/testutil" ) diff --git a/test/e2e/plain_provisioner_test.go b/test/e2e/plain_provisioner_test.go index fba55fe6..e1fc6095 100644 --- a/test/e2e/plain_provisioner_test.go +++ b/test/e2e/plain_provisioner_test.go @@ -30,8 +30,8 @@ import ( rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2" "github.com/operator-framework/rukpak/internal/provisioner/plain" - "github.com/operator-framework/rukpak/internal/storage" - "github.com/operator-framework/rukpak/internal/util" + "github.com/operator-framework/rukpak/pkg/storage" + "github.com/operator-framework/rukpak/pkg/util" ) const (