Skip to content

✨ OPRUN-3763: Consolidate api directory #1800

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 24, 2025
Merged

✨ OPRUN-3763: Consolidate api directory #1800

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
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@ KUSTOMIZE_OPCON_CRDS_DIR := config/base/operator-controller/crd/bases
KUSTOMIZE_OPCON_RBAC_DIR := config/base/operator-controller/rbac
manifests: $(CONTROLLER_GEN) #EXHELP Generate WebhookConfiguration, ClusterRole, and CustomResourceDefinition objects.
# Generate the operator-controller manifests
rm -rf $(KUSTOMIZE_OPCON_CRDS_DIR) && $(CONTROLLER_GEN) crd paths=./api/... output:crd:artifacts:config=$(KUSTOMIZE_OPCON_CRDS_DIR)
rm -rf $(KUSTOMIZE_OPCON_CRDS_DIR) && $(CONTROLLER_GEN) crd paths=./api/operator-controller/... output:crd:artifacts:config=$(KUSTOMIZE_OPCON_CRDS_DIR)
rm -f $(KUSTOMIZE_OPCON_RBAC_DIR)/role.yaml && $(CONTROLLER_GEN) rbac:roleName=manager-role paths=./internal/operator-controller/... output:rbac:artifacts:config=$(KUSTOMIZE_OPCON_RBAC_DIR)
# Generate the catalogd manifests
rm -rf $(KUSTOMIZE_CATD_CRDS_DIR) && $(CONTROLLER_GEN) crd paths="./catalogd/api/..." output:crd:artifacts:config=$(KUSTOMIZE_CATD_CRDS_DIR)
rm -rf $(KUSTOMIZE_CATD_CRDS_DIR) && $(CONTROLLER_GEN) crd paths=./api/catalogd/... output:crd:artifacts:config=$(KUSTOMIZE_CATD_CRDS_DIR)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By consolidating the API, I thunk we no longer need to generate rules webhooks and crd spllited
We can just

$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases

Also, I think we need to stop to rm the files.
We should run the commands and the make verify should fail if has a diff instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't a 100% consolidation, as the CRDs are still put into separate locations of the config to keep them with their corresponding manager, which is desirable as far as downstream is concerned.

I'm looking at a fixup commit to this one that does the 100% consolidation, and it is starting out to be much bigger and complicated...

I would have to look at why/when rm was added, and I think it was to properly make all the files and clean up those that don't need to exist any more? But it was put there for a reason.

Copy link
Contributor

@camilamacedo86 camilamacedo86 Feb 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the rm was added to ensure that we always generate it.
but for all we can either do that in a follow-up.
So, there is no reason to block this one

rm -f $(KUSTOMIZE_CATD_RBAC_DIR)/role.yaml && $(CONTROLLER_GEN) rbac:roleName=manager-role paths="./internal/catalogd/..." output:rbac:artifacts:config=$(KUSTOMIZE_CATD_RBAC_DIR)
rm -f $(KUSTOMIZE_CATD_WEBHOOKS_DIR)/manifests.yaml && $(CONTROLLER_GEN) webhook paths="./internal/catalogd/..." output:webhook:artifacts:config=$(KUSTOMIZE_CATD_WEBHOOKS_DIR)

Expand Down Expand Up @@ -358,12 +358,12 @@ API_REFERENCE_DIR := $(ROOT_DIR)/docs/api-reference

crd-ref-docs: $(CRD_REF_DOCS) #EXHELP Generate the API Reference Documents.
rm -f $(API_REFERENCE_DIR)/$(OPERATOR_CONTROLLER_API_REFERENCE_FILENAME)
$(CRD_REF_DOCS) --source-path=$(ROOT_DIR)/api \
$(CRD_REF_DOCS) --source-path=$(ROOT_DIR)/api/operator-controller \
--config=$(API_REFERENCE_DIR)/crd-ref-docs-gen-config.yaml \
--renderer=markdown --output-path=$(API_REFERENCE_DIR)/$(OPERATOR_CONTROLLER_API_REFERENCE_FILENAME);

rm -f $(API_REFERENCE_DIR)/$(CATALOGD_API_REFERENCE_FILENAME)
$(CRD_REF_DOCS) --source-path=$(ROOT_DIR)/catalogd/api \
$(CRD_REF_DOCS) --source-path=$(ROOT_DIR)/api/catalogd \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we not simplify here as well ./...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not if the API docs are in different locations, if we wish to consolidate the documentation, then that's a possibility.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to consolidate all.
They are the same API group.
I do not think we should have the catalogd and operator-controller dir at all.

--config=$(API_REFERENCE_DIR)/crd-ref-docs-gen-config.yaml \
--renderer=markdown --output-path=$(API_REFERENCE_DIR)/$(CATALOGD_API_REFERENCE_FILENAME);

Expand Down
4 changes: 2 additions & 2 deletions Tiltfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ operator_controller = {
'binaries': {
'./cmd/operator-controller': 'operator-controller-controller-manager',
},
'deps': ['api', 'cmd/operator-controller', 'internal', 'pkg', 'go.mod', 'go.sum'],
'deps': ['api/operator-controller', 'cmd/operator-controller', 'internal/operator-controller', 'internal/shared', 'go.mod', 'go.sum'],
'starting_debug_port': 30000,
}
deploy_repo('operator-controller', operator_controller, '-tags containers_image_openpgp')
Expand All @@ -17,7 +17,7 @@ catalogd = {
'binaries': {
'./catalogd/cmd/catalogd': 'catalogd-controller-manager',
},
'deps': ['catalogd/api', 'catalogd/cmd/catalogd', 'catalogd/internal', 'catalogd/pkg', 'go.mod', 'go.sum'],
'deps': ['api/catalogd', 'catalogd/cmd/catalogd', 'internal/catalogd', 'internal/shared', 'go.mod', 'go.sum'],
'starting_debug_port': 20000,
}

Expand Down
2 changes: 1 addition & 1 deletion catalogd/api/doc.go → api/catalogd/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

//go:generate apiregister-gen --input-dirs ./... -h ../../boilerplate.go.txt
//go:generate apiregister-gen --input-dirs ./... -h ../../hack/boilerplate.go.txt

//
// +domain=operatorframework.io
Expand Down
0 catalogd/api/v1/clustercatalog_types.go → api/catalogd/v1/clustercatalog_types.go
View file
Open in desktop
File renamed without changes.
0 catalogd/api/v1/clustercatalog_types_test.go → api/catalogd/v1/clustercatalog_types_test.go
View file
Open in desktop
File renamed without changes.
0 catalogd/api/v1/groupversion_info.go → api/catalogd/v1/groupversion_info.go
View file
Open in desktop
File renamed without changes.
0 catalogd/api/v1/zz_generated.deepcopy.go → api/catalogd/v1/zz_generated.deepcopy.go
View file
Open in desktop
File renamed without changes.
0 api/v1/clusterextension_types.go → ...r-controller/v1/clusterextension_types.go
View file
Open in desktop
File renamed without changes.
0 api/v1/clusterextension_types_test.go → ...troller/v1/clusterextension_types_test.go
View file
Open in desktop
File renamed without changes.
0 api/v1/groupversion_info.go → ...erator-controller/v1/groupversion_info.go
View file
Open in desktop
File renamed without changes.
0 api/v1/zz_generated.deepcopy.go → ...or-controller/v1/zz_generated.deepcopy.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion catalogd/cmd/catalogd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ import (
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
crwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"

catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
catalogdv1 "github.com/operator-framework/operator-controller/api/catalogd/v1"
corecontrollers "github.com/operator-framework/operator-controller/internal/catalogd/controllers/core"
"github.com/operator-framework/operator-controller/internal/catalogd/features"
"github.com/operator-framework/operator-controller/internal/catalogd/garbagecollection"
Expand Down
4 changes: 2 additions & 2 deletions cmd/operator-controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ import (

helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
catalogd "github.com/operator-framework/operator-controller/api/catalogd/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
"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"
Expand Down
2 changes: 1 addition & 1 deletion internal/catalogd/controllers/core/clustercatalog_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
catalogdv1 "github.com/operator-framework/operator-controller/api/catalogd/v1"
"github.com/operator-framework/operator-controller/internal/catalogd/storage"
imageutil "github.com/operator-framework/operator-controller/internal/shared/util/image"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/catalogd/controllers/core/clustercatalog_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
catalogdv1 "github.com/operator-framework/operator-controller/api/catalogd/v1"
"github.com/operator-framework/operator-controller/internal/catalogd/storage"
imageutil "github.com/operator-framework/operator-controller/internal/shared/util/image"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/catalogd/garbagecollection/garbage_collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"k8s.io/client-go/metadata"
"sigs.k8s.io/controller-runtime/pkg/manager"

catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
catalogdv1 "github.com/operator-framework/operator-controller/api/catalogd/v1"
)

var _ manager.Runnable = (*GarbageCollector)(nil)
Expand Down
2 changes: 1 addition & 1 deletion internal/catalogd/garbagecollection/garbage_collector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/metadata/fake"

catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
catalogdv1 "github.com/operator-framework/operator-controller/api/catalogd/v1"
)

func TestRunGarbageCollection(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/catalogd/webhook/cluster_catalog_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/log"

catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
catalogdv1 "github.com/operator-framework/operator-controller/api/catalogd/v1"
)

// +kubebuilder:webhook:admissionReviewVersions={v1},failurePolicy=Fail,groups=olm.operatorframework.io,mutating=true,name=inject-metadata-name.olm.operatorframework.io,path=/mutate-olm-operatorframework-io-v1-clustercatalog,resources=clustercatalogs,verbs=create;update,versions=v1,sideEffects=None,timeoutSeconds=10
Expand Down
2 changes: 1 addition & 1 deletion internal/catalogd/webhook/cluster_catalog_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
catalogdv1 "github.com/operator-framework/operator-controller/api/catalogd/v1"
)

// Define a dummy struct that implements runtime.Object but isn't a ClusterCatalog
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/action/restconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"k8s.io/client-go/rest"
"sigs.k8s.io/controller-runtime/pkg/client"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
"github.com/operator-framework/operator-controller/internal/operator-controller/authentication"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/applier/helm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
"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"
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/applier/helm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (

helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"

v1 "github.com/operator-framework/operator-controller/api/v1"
v1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
"github.com/operator-framework/operator-controller/internal/operator-controller/applier"
"github.com/operator-framework/operator-controller/internal/operator-controller/features"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/bundleutil/bundle.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"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
)

func GetVersion(b declcfg.Bundle) (*bsemver.Version, error) {
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/catalogmetadata/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

"github.com/operator-framework/operator-registry/alpha/declcfg"

catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
catalogd "github.com/operator-framework/operator-controller/api/catalogd/v1"
httputil "github.com/operator-framework/operator-controller/internal/shared/util/http"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/catalogmetadata/client/client_test.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"
catalogd "github.com/operator-framework/operator-controller/api/catalogd/v1"
catalogClient "github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/client"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/catalogmetadata/filter/successors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/operator-framework/operator-registry/alpha/declcfg"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
"github.com/operator-framework/operator-controller/internal/shared/util/filter"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/catalogmetadata/filter/successors_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/operator-framework/operator-registry/alpha/declcfg"
"github.com/operator-framework/operator-registry/alpha/property"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
"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/shared/util/filter"
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/conditionsets/conditionsets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package conditionsets

import (
ocv1 "github.com/operator-framework/operator-controller/api/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
)

// ConditionTypes is the full set of ClusterExtension condition Types.
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/contentmanager/cache/cache_test.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/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
)

type mockWatcher struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/contentmanager/contentmanager.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/client-go/rest"
"sigs.k8s.io/controller-runtime/pkg/client"

v1 "github.com/operator-framework/operator-controller/api/v1"
v1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
cmcache "github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager/cache"
oclabels "github.com/operator-framework/operator-controller/internal/operator-controller/labels"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/contentmanager/source/dynamicsource_test.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/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/api/operator-controller/v1"
)

func TestDynamicInformerSourceCloseBeforeStartErrors(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/contentmanager/sourcerer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"

v1 "github.com/operator-framework/operator-controller/api/v1"
v1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
"github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager/cache"
"github.com/operator-framework/operator-controller/internal/operator-controller/contentmanager/source"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/controllers/clustercatalog_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log"

catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
catalogd "github.com/operator-framework/operator-controller/api/catalogd/v1"
)

type CatalogCache interface {
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/controllers/clustercatalog_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client/fake"

catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
catalogd "github.com/operator-framework/operator-controller/api/catalogd/v1"
"github.com/operator-framework/operator-controller/internal/operator-controller/controllers"
"github.com/operator-framework/operator-controller/internal/operator-controller/scheme"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/controllers/clusterextension_admission_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
)

func TestClusterExtensionSourceConfig(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/operator-controller/controllers/clusterextension_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ import (
helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
"github.com/operator-framework/operator-registry/alpha/declcfg"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
catalogd "github.com/operator-framework/operator-controller/api/catalogd/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
"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"
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/controllers/clusterextension_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
"github.com/operator-framework/operator-registry/alpha/declcfg"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
"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"
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/controllers/common_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
)

// setInstalledStatusFromBundle sets the installed status based on the given installedBundle.
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/controllers/common_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
)

func TestSetStatusProgressing(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/controllers/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (

helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
"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"
Expand Down
4 changes: 2 additions & 2 deletions internal/operator-controller/resolve/catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (

"github.com/operator-framework/operator-registry/alpha/declcfg"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
catalogd "github.com/operator-framework/operator-controller/api/catalogd/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
"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"
Expand Down
4 changes: 2 additions & 2 deletions internal/operator-controller/resolve/catalog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"github.com/operator-framework/operator-registry/alpha/declcfg"
"github.com/operator-framework/operator-registry/alpha/property"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
catalogd "github.com/operator-framework/operator-controller/api/catalogd/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
)

func TestInvalidClusterExtensionVersionRange(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/resolve/resolver.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/operator-framework/operator-registry/alpha/declcfg"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
)

type Resolver interface {
Expand Down
4 changes: 2 additions & 2 deletions internal/operator-controller/scheme/scheme.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
catalogd "github.com/operator-framework/operator-controller/api/catalogd/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
)

var Scheme = runtime.NewScheme()
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/cluster_extension_install_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"k8s.io/apimachinery/pkg/util/rand"
"sigs.k8s.io/controller-runtime/pkg/client"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
catalogd "github.com/operator-framework/operator-controller/api/catalogd/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
"github.com/operator-framework/operator-controller/test/utils"
)

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/e2e_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
catalogd "github.com/operator-framework/operator-controller/api/catalogd/v1"
"github.com/operator-framework/operator-controller/internal/operator-controller/scheme"
)

Expand Down
4 changes: 2 additions & 2 deletions test/extension-developer-e2e/extension_developer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

ocv1 "github.com/operator-framework/operator-controller/api/v1"
catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
catalogd "github.com/operator-framework/operator-controller/api/catalogd/v1"
ocv1 "github.com/operator-framework/operator-controller/api/operator-controller/v1"
)

func TestExtensionDeveloper(t *testing.T) {
Expand Down
Loading
Loading