Skip to content
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.

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

fix: rename operatorhub crd manifest file #1178

Merged

Conversation

njhale
Copy link
Contributor

@njhale njhale commented Apr 12, 2022

Rename the OperatorHub CRD manifest file to denote the SLO it belongs
to: the marketplace-operator. The current name causes the CRD to be
applied during cluster bootstrapping -- as a part of the
cluster-config-operator -- despite attempts to disable the
"marketplace" capability to which the CRD belongs.

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

cc @wking @bparees @perdasilva

Supersedes #1177

Rename the OperatorHub CRD manifest file to denote the SLO it belongs
to: the marketplace-operator. The current name causes the CRD to be
applied during cluster bootstrapping -- as a part of the
cluster-config-operator -- despite attempts to disable the
marketplace component.

Signed-off-by: Nick Hale <njohnhale@gmail.com>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 13, 2022

@njhale: all tests passed!

Full PR test history. Your PR dashboard.

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.

Copy link
Member

@wking wking left a comment

Choose a reason for hiding this comment

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

Sets up operator-framework/operator-marketplace#467, transferring the manifest from the config operator to the marketplace operator.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 13, 2022
@bparees
Copy link
Contributor

bparees commented Apr 13, 2022

/approve
/hold

want to make sure we orchestrate the 3 PRs to land as closely together as possible, lest someone else vendor bump the config-operator after this merges and we lose the resource entirely in an intermediary payload.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 13, 2022
@bparees bparees added qe-approved Signifies that QE has signed off on this PR docs-approved Signifies that Docs has signed off on this PR px-approved Signifies that Product Support has signed off on this PR labels Apr 13, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 13, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees, njhale, wking

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

The pull request process is described here

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
@bparees
Copy link
Contributor

bparees commented Apr 13, 2022

applying docs/qe/px labels as this has no effect on product function

@njhale
Copy link
Contributor Author

njhale commented Apr 13, 2022

want to make sure we orchestrate the 3 PRs to land as closely together as possible, lest someone else vendor bump the config-operator after this merges and we lose the resource entirely in an intermediary payload.

operator-framework/operator-marketplace#467 merged, I think we're good to merge this then open up the vendor bump for the config-operator

@bparees
Copy link
Contributor

bparees commented Apr 13, 2022

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 13, 2022
@openshift-merge-robot openshift-merge-robot merged commit 070bf8b into openshift:master Apr 13, 2022
@njhale njhale deleted the fix/operatorhub-manifest branch May 4, 2022 19:00
wking added a commit to wking/origin that referenced this pull request May 29, 2022
… is enabled

Like 6d1143a (cli: remove metal3 CRDs when capabilities are none,
2022-04-08, openshift#26998), but catching up to openshift/api@d905557541 (fix:
rename operatorhub crd manifest file, 2022-04-12, openshift/api#1178)
and operator-framework/operator-marketplace@eca17739ed
(chore(modules): bump openshift/api for new operatorhub crd,
2022-05-02, operator-framework/operator-marketplace#472) dancing the
OperatorHub CRD over to the marketplace operator, and making it part
of the 'marketplace' cluster-version capability.
wking added a commit to wking/origin that referenced this pull request Jun 1, 2022
… is enabled

Like 6d1143a (cli: remove metal3 CRDs when capabilities are none,
2022-04-08, openshift#26998), but catching up to openshift/api@d905557541 (fix:
rename operatorhub crd manifest file, 2022-04-12, openshift/api#1178)
and operator-framework/operator-marketplace@eca17739ed
(chore(modules): bump openshift/api for new operatorhub crd,
2022-05-02, operator-framework/operator-marketplace#472) dancing the
OperatorHub CRD over to the marketplace operator, and making it part
of the 'marketplace' cluster-version capability.
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. docs-approved Signifies that Docs has signed off on this PR lgtm Indicates that a PR is ready to be merged. px-approved Signifies that Product Support has signed off on this PR qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants