Skip to content

🌱 Moving pkgs to internal/operator-controller/ #1737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 11, 2025
Merged

🌱 Moving pkgs to internal/operator-controller/ #1737

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
2 changes: 1 addition & 1 deletion api/v1/clusterextension_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion catalogd/internal/source/containers_image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
28 changes: 14 additions & 14 deletions cmd/operator-controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
0 internal/action/error/errors.go → ...perator-controller/action/error/errors.go
View file
Open in desktop
File renamed without changes.
0 internal/action/error/errors_test.go → ...or-controller/action/error/errors_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/action/helm.go → internal/operator-controller/action/helm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 internal/action/helm_test.go → ...l/operator-controller/action/helm_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/action/restconfig.go → .../operator-controller/action/restconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
0 internal/action/storagedriver.go → ...erator-controller/action/storagedriver.go
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions internal/applier/helm.go → internal/operator-controller/applier/helm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions internal/applier/helm_test.go → .../operator-controller/applier/helm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 internal/authentication/tokengetter.go → ...-controller/authentication/tokengetter.go
View file
Open in desktop
File renamed without changes.
0 internal/authentication/tokengetter_test.go → ...roller/authentication/tokengetter_test.go
View file
Open in desktop
File renamed without changes.
0 internal/authentication/tripper.go → ...ator-controller/authentication/tripper.go
View file
Open in desktop
File renamed without changes.
0 internal/bundleutil/bundle.go → .../operator-controller/bundleutil/bundle.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/bundleutil/bundle_test.go → ...ator-controller/bundleutil/bundle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion internal/catalogmetadata/cache/cache.go → ...controller/catalogmetadata/cache/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
2 changes: 1 addition & 1 deletion internal/catalogmetadata/cache/cache_test.go → ...oller/catalogmetadata/cache/cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion internal/catalogmetadata/client/client.go → ...ntroller/catalogmetadata/client/client.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/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 (
Expand Down
2 changes: 1 addition & 1 deletion ...nal/catalogmetadata/client/client_test.go → ...ler/catalogmetadata/client/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/catalogmetadata/compare/compare.go → ...roller/catalogmetadata/compare/compare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...l/catalogmetadata/compare/compare_test.go → ...r/catalogmetadata/compare/compare_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion ...talogmetadata/filter/bundle_predicates.go → ...talogmetadata/filter/bundle_predicates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion ...metadata/filter/bundle_predicates_test.go → ...metadata/filter/bundle_predicates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
0 ...rnal/catalogmetadata/filter/successors.go → ...ller/catalogmetadata/filter/successors.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...catalogmetadata/filter/successors_test.go → ...catalogmetadata/filter/successors_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 internal/conditionsets/conditionsets.go → ...controller/conditionsets/conditionsets.go
View file
Open in desktop
File renamed without changes.
0 internal/contentmanager/cache/cache.go → ...-controller/contentmanager/cache/cache.go
View file
Open in desktop
File renamed without changes.
0 internal/contentmanager/cache/cache_test.go → ...roller/contentmanager/cache/cache_test.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions internal/contentmanager/contentmanager.go → ...ntroller/contentmanager/contentmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...al/contentmanager/source/dynamicsource.go → ...er/contentmanager/source/dynamicsource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 ...ntentmanager/source/dynamicsource_test.go → ...ntentmanager/source/dynamicsource_test.go
View file
Open in desktop
File renamed without changes.
0 ...ntmanager/source/internal/eventhandler.go → ...ntmanager/source/internal/eventhandler.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions internal/contentmanager/sourcerer.go → ...or-controller/contentmanager/sourcerer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 .../controllers/clustercatalog_controller.go → .../controllers/clustercatalog_controller.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...rollers/clustercatalog_controller_test.go → ...rollers/clustercatalog_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
0 ...ollers/clusterextension_admission_test.go → ...ollers/clusterextension_admission_test.go
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions ...ontrollers/clusterextension_controller.go → ...ontrollers/clusterextension_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
14 changes: 7 additions & 7 deletions ...llers/clusterextension_controller_test.go → ...llers/clusterextension_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 internal/controllers/common_controller.go → ...ntroller/controllers/common_controller.go
View file
Open in desktop
File renamed without changes.
0 ...nal/controllers/common_controller_test.go → ...ler/controllers/common_controller_test.go
View file
Open in desktop
File renamed without changes.
0 ...nal/controllers/pull_secret_controller.go → ...ler/controllers/pull_secret_controller.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ontrollers/pull_secret_controller_test.go → ...ontrollers/pull_secret_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 5 additions & 5 deletions internal/controllers/suite_test.go → ...ator-controller/controllers/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
}
Expand Down
0 internal/features/features.go → .../operator-controller/features/features.go
View file
Open in desktop
File renamed without changes.
0 internal/finalizers/finalizers.go → ...rator-controller/finalizers/finalizers.go
View file
Open in desktop
File renamed without changes.
0 internal/httputil/certlog.go → ...l/operator-controller/httputil/certlog.go
View file
Open in desktop
File renamed without changes.
0 internal/httputil/certpoolwatcher.go → ...or-controller/httputil/certpoolwatcher.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/httputil/certpoolwatcher_test.go → ...ntroller/httputil/certpoolwatcher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
0 internal/httputil/certutil.go → .../operator-controller/httputil/certutil.go
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions internal/httputil/certutil_test.go → ...ator-controller/httputil/certutil_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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())
Expand Down
0 internal/httputil/httputil.go → .../operator-controller/httputil/httputil.go
View file
Open in desktop
File renamed without changes.
0 internal/labels/labels.go → ...rnal/operator-controller/labels/labels.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions internal/resolve/catalog.go → ...al/operator-controller/resolve/catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 internal/resolve/catalog_test.go → ...erator-controller/resolve/catalog_test.go
View file
Open in desktop
File renamed without changes.
0 internal/resolve/resolver.go → ...l/operator-controller/resolve/resolver.go
View file
Open in desktop
File renamed without changes.
0 internal/resolve/validation.go → ...operator-controller/resolve/validation.go
View file
Open in desktop
File renamed without changes.
0 internal/resolve/validation_test.go → ...tor-controller/resolve/validation_test.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions internal/rukpak/convert/registryv1.go → ...r-controller/rukpak/convert/registryv1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 internal/rukpak/convert/registryv1_test.go → ...troller/rukpak/convert/registryv1_test.go
View file
Open in desktop
File renamed without changes.
0 ...bine-properties-bundle/manifests/csv.yaml → ...bine-properties-bundle/manifests/csv.yaml
View file
Open in desktop
File renamed without changes.
0 ...operties-bundle/metadata/annotations.yaml → ...operties-bundle/metadata/annotations.yaml
View file
Open in desktop
File renamed without changes.
0 ...roperties-bundle/metadata/properties.yaml → ...roperties-bundle/metadata/properties.yaml
View file
Open in desktop
File renamed without changes.
0 ...rnal/rukpak/operator-registry/registry.go → ...ller/rukpak/operator-registry/registry.go
View file
Open in desktop
File renamed without changes.
0 ...pak/preflights/crdupgradesafety/checks.go → ...pak/preflights/crdupgradesafety/checks.go
View file
Open in desktop
File renamed without changes.
0 ...reflights/crdupgradesafety/checks_test.go → ...reflights/crdupgradesafety/checks_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ghts/crdupgradesafety/crdupgradesafety.go → ...ghts/crdupgradesafety/crdupgradesafety.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading
Loading