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

Export rukpak functionality #876

Merged
merged 1 commit into from
May 2, 2024
Merged

Export rukpak functionality #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/core/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions cmd/helm/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion cmd/webhooks/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions internal/controllers/bundledeployment/bundledeployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/bundledeployment/bundledeployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion internal/finalizer/deletecachedbundle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
2 changes: 1 addition & 1 deletion internal/provisioner/helm/helm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion internal/provisioner/plain/plain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion internal/provisioner/registry/registry.go
View file
Open in desktop
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/convert"
"github.com/operator-framework/rukpak/internal/provisioner/plain"
"github.com/operator-framework/rukpak/pkg/convert"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/convert/registryv1.go → pkg/convert/registryv1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 internal/convert/registryv1_test.go → pkg/convert/registryv1_test.go
View file
Open in desktop
File renamed without changes.
0 internal/source/common.go → pkg/source/common.go
View file
Open in desktop
File renamed without changes.
0 internal/source/configmaps.go → pkg/source/configmaps.go
View file
Open in desktop
File renamed without changes.
0 internal/source/git.go → pkg/source/git.go
View file
Open in desktop
File renamed without changes.
0 internal/source/http.go → pkg/source/http.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/source/image.go → pkg/source/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 internal/source/unpacker.go → pkg/source/unpacker.go
View file
Open in desktop
File renamed without changes.
0 internal/storage/http.go → pkg/storage/http.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/storage/http_test.go → pkg/storage/http_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion internal/storage/localdir.go → pkg/storage/localdir.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
0 internal/storage/localdir_test.go → pkg/storage/localdir_test.go
View file
Open in desktop
File renamed without changes.
0 internal/storage/storage.go → pkg/storage/storage.go
View file
Open in desktop
File renamed without changes.
0 internal/storage/storage_suite_test.go → pkg/storage/storage_suite_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/storage/storage_test.go → pkg/storage/storage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
0 internal/util/defaults.go → pkg/util/defaults.go
View file
Open in desktop
File renamed without changes.
0 internal/util/fs.go → pkg/util/fs.go
View file
Open in desktop
File renamed without changes.
0 internal/util/hash.go → pkg/util/hash.go
View file
Open in desktop
File renamed without changes.
0 internal/util/labels.go → pkg/util/labels.go
View file
Open in desktop
File renamed without changes.
0 internal/util/tar.go → pkg/util/tar.go
View file
Open in desktop
File renamed without changes.
0 internal/util/util.go → pkg/util/util.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion test/e2e/crdvalidator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions test/e2e/plain_provisioner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
Loading