Skip to content
This repository has been archived by the owner on Aug 12, 2024. It is now read-only.

Commit

Permalink
Make provisioner logic external
Browse files Browse the repository at this point in the history 
This commit pulls the provisioner logic in rukpak
under pkg/, so that it can be easily be used
by operator-controller.

Signed-off-by: Varsha Prasad Narsing <[email protected]>
  • Loading branch information
@varshaprasad96
varshaprasad96 committed Jun 12, 2024
1 parent ac1802e commit 45d77f6
Show file tree
Hide file tree
Showing 10 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions cmd/core/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/helm/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 internal/provisioner/helm/helm.go → pkg/provisioner/helm/helm.go
View file
File renamed without changes.
0 internal/provisioner/plain/plain.go → pkg/provisioner/plain/plain.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/provisioner/registry/registry.go → pkg/provisioner/registry/registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/api_validation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/helm_provisioner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/plain_provisioner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/registry_provisioner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/webhook_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit 45d77f6

Please sign in to comment.