Skip to content

fix(manifests): add singleton operatorhub cr - #468

Merged
openshift-merge-robot merged 1 commit into
operator-framework:masterfrom
njhale:fix/empty-operatorhub
Apr 13, 2022
Merged

fix(manifests): add singleton operatorhub cr#468
openshift-merge-robot merged 1 commit into
operator-framework:masterfrom
njhale:fix/empty-operatorhub

Conversation

@njhale

@njhale njhale commented Apr 13, 2022

Copy link
Copy Markdown
Member
  • Relocate the singleton OperatorHub CR instance from openshift/cluster-config-operator
  • add the marketplace capability annotatation to CR instance

This consolidates ownership of OperatorHub-related manifests to the marketplace-operator
and will help prevent issues with resource application order.

Signed-off-by: Nick Hale njohnhale@gmail.com

@openshift-ci
openshift-ci Bot requested review from dinhxuanvu and exdx April 13, 2022 18:09
@openshift-ci

openshift-ci Bot commented Apr 13, 2022

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: njhale

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 13, 2022
@@ -0,0 +1,11 @@
apiVersion: config.openshift.io/v1

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We want a filename that sorts after 0000_03_config-operator_01_operatorhub.crd.yaml (which is what's currently vendored) and 0000_03_marketplace-operator_01_operatorhub.crd.yaml (where openshift/api#1178 is taking the CRD). Maybe 0000_03_marketplace-operator_02_operatorhub.cr.yaml?

@njhale
njhale force-pushed the fix/empty-operatorhub branch 2 times, most recently from c3470e6 to a91a99f Compare April 13, 2022 18:29
Comment thread manifests/0000_03_marketplace-operator_02_operatorhub.cr.yaml
- Relocate the singleton OperatorHub CR instance from openshift/cluster-config-operator
- add the marketplace capability annotatation to CR instance

This consolidates ownership of OperatorHub-related manifests to the marketplace-operator
and will help prevent issues with resource application order.

Signed-off-by: Nick Hale <njohnhale@gmail.com>
@njhale
njhale force-pushed the fix/empty-operatorhub branch from a91a99f to c2a6e95 Compare April 13, 2022 19:09
@njhale njhale changed the title fix(manifests): add empty operatorhub cr fix(manifests): add singleton operatorhub cr Apr 13, 2022
apiVersion: config.openshift.io/v1
kind: OperatorHub
metadata:
name: cluster

@njhale njhale Apr 13, 2022

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

@wking confirmed that CVO won't have a problem with the (temporary) duplicate in openshift/cluster-config-operator. The PR to remove that is also queued up for after this merges: openshift/cluster-config-operator#245

@exdx

exdx commented Apr 13, 2022

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 13, 2022
@openshift-ci

openshift-ci Bot commented Apr 13, 2022

Copy link
Copy Markdown
Contributor

@njhale: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-e2e-gcp c2a6e95 link false /test okd-e2e-gcp

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-bot

Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot
openshift-merge-robot merged commit bd263c1 into operator-framework:master Apr 13, 2022
@njhale
njhale deleted the fix/empty-operatorhub branch April 19, 2022 14:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants