diff --git a/cmd/core/main.go b/cmd/core/main.go index 6abf9ce3..305d86e1 100644 --- a/cmd/core/main.go +++ b/cmd/core/main.go @@ -47,12 +47,12 @@ import ( rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2" "github.com/operator-framework/rukpak/internal/controllers/bundledeployment" - "github.com/operator-framework/rukpak/internal/provisioner/plain" - "github.com/operator-framework/rukpak/internal/provisioner/registry" "github.com/operator-framework/rukpak/internal/version" "github.com/operator-framework/rukpak/pkg/features" "github.com/operator-framework/rukpak/pkg/finalizer" "github.com/operator-framework/rukpak/pkg/preflights/crdupgradesafety" + "github.com/operator-framework/rukpak/pkg/provisioner/plain" + "github.com/operator-framework/rukpak/pkg/provisioner/registry" "github.com/operator-framework/rukpak/pkg/source" "github.com/operator-framework/rukpak/pkg/storage" "github.com/operator-framework/rukpak/pkg/util" diff --git a/cmd/helm/main.go b/cmd/helm/main.go index 001a3022..0d0a80c8 100644 --- a/cmd/helm/main.go +++ b/cmd/helm/main.go @@ -42,9 +42,9 @@ import ( rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2" "github.com/operator-framework/rukpak/internal/controllers/bundledeployment" - "github.com/operator-framework/rukpak/internal/provisioner/helm" "github.com/operator-framework/rukpak/internal/version" "github.com/operator-framework/rukpak/pkg/finalizer" + "github.com/operator-framework/rukpak/pkg/provisioner/helm" "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/provisioner/helm/helm.go b/pkg/provisioner/helm/helm.go similarity index 100% rename from internal/provisioner/helm/helm.go rename to pkg/provisioner/helm/helm.go diff --git a/internal/provisioner/plain/plain.go b/pkg/provisioner/plain/plain.go similarity index 100% rename from internal/provisioner/plain/plain.go rename to pkg/provisioner/plain/plain.go diff --git a/internal/provisioner/registry/registry.go b/pkg/provisioner/registry/registry.go similarity index 92% rename from internal/provisioner/registry/registry.go rename to pkg/provisioner/registry/registry.go index 572e8385..76794b4e 100644 --- a/internal/provisioner/registry/registry.go +++ b/pkg/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/provisioner/plain" "github.com/operator-framework/rukpak/pkg/convert" + "github.com/operator-framework/rukpak/pkg/provisioner/plain" ) const ( diff --git a/test/e2e/api_validation_test.go b/test/e2e/api_validation_test.go index 6866c6b5..ebce167c 100644 --- a/test/e2e/api_validation_test.go +++ b/test/e2e/api_validation_test.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2" - "github.com/operator-framework/rukpak/internal/provisioner/plain" + "github.com/operator-framework/rukpak/pkg/provisioner/plain" ) var _ = Describe("bundle api validation", func() { diff --git a/test/e2e/helm_provisioner_test.go b/test/e2e/helm_provisioner_test.go index 6c9a01c4..0c8813ba 100644 --- a/test/e2e/helm_provisioner_test.go +++ b/test/e2e/helm_provisioner_test.go @@ -15,7 +15,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2" - "github.com/operator-framework/rukpak/internal/provisioner/helm" + "github.com/operator-framework/rukpak/pkg/provisioner/helm" ) var _ = Describe("helm provisioner bundledeployment", func() { diff --git a/test/e2e/plain_provisioner_test.go b/test/e2e/plain_provisioner_test.go index 3098ccf0..5b9fedd9 100644 --- a/test/e2e/plain_provisioner_test.go +++ b/test/e2e/plain_provisioner_test.go @@ -29,7 +29,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2" - "github.com/operator-framework/rukpak/internal/provisioner/plain" + "github.com/operator-framework/rukpak/pkg/provisioner/plain" "github.com/operator-framework/rukpak/pkg/storage" "github.com/operator-framework/rukpak/pkg/util" ) diff --git a/test/e2e/registry_provisioner_test.go b/test/e2e/registry_provisioner_test.go index 73c425d1..728792b4 100644 --- a/test/e2e/registry_provisioner_test.go +++ b/test/e2e/registry_provisioner_test.go @@ -12,7 +12,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2" - registryprovisioner "github.com/operator-framework/rukpak/internal/provisioner/registry" + registryprovisioner "github.com/operator-framework/rukpak/pkg/provisioner/registry" ) var _ = Describe("registry provisioner bundle", func() { diff --git a/test/e2e/webhook_test.go b/test/e2e/webhook_test.go index 1977b8f7..3abd225a 100644 --- a/test/e2e/webhook_test.go +++ b/test/e2e/webhook_test.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2" - "github.com/operator-framework/rukpak/internal/provisioner/plain" + "github.com/operator-framework/rukpak/pkg/provisioner/plain" ) var _ = Describe("bundle deployment api validating webhook", func() {