Skip to content

Conversation

@njhale
Copy link
Member

@njhale njhale commented Mar 24, 2022

Description of the change:

Register CVO-managed manifests under the optional marketplace capability.

See also:

Motivation for the change:

We want OpenShift users to be able to disable/enable the marketplace operator without putting their cluster into an unmanaged state.

Jira: OLM-2474

Register CVO-managed manifests under the optional `marketplace` capability.
@openshift-ci openshift-ci bot requested a review from anik120 March 24, 2022 15:24
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 24, 2022

[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 requested a review from ankitathomas March 24, 2022 15:24
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 24, 2022
@njhale
Copy link
Member Author

njhale commented Mar 24, 2022

cc @bparees

@bparees
Copy link

bparees commented Mar 24, 2022

where is the OperatorHub CRD itself defined? i'd expect it to be excluded when this cap is not enabled, also.

@perdasilva
Copy link
Contributor

perdasilva commented Mar 24, 2022

@njhale do we want to add some documentation to the readme as well to say where this annotation and value come from?

@timflannagan
Copy link
Member

where is the OperatorHub CRD itself defined? i'd expect it to be excluded when this cap is not enabled, also.

It looks like is defined in o/api: https://github.com/openshift/api/blob/master/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml

@bparees
Copy link

bparees commented Mar 24, 2022

ok so openshift/api#1150 should be marking it as a capability unless there is another reason to have that api defined when the marketplace operator is disabled

(it'll be interesting to see what happens to the console when marketplace is disabled)

@njhale
Copy link
Member Author

njhale commented Mar 24, 2022

ok so openshift/api#1150 should be marking it as a capability unless there is another reason to have that api defined when the marketplace operator is disabled

(it'll be interesting to see what happens to the console when marketplace is disabled)

@bparees just pushed that change actually: https://github.com/openshift/api/pull/1150/files#diff-c53669fc670c26b116439080f132967cca87dec5864c511ed7772de465e0bf7fR9

@bparees
Copy link

bparees commented Mar 24, 2022

@njhale
Copy link
Member Author

njhale commented Mar 24, 2022

@njhale do we want to add some documentation to the readme as well to say where this annotation and value come from?

I'm not too sure. The annotation is namespaced to openshift, so it should be pretty simple to look up if someone tweaking these manifests is unsure of their origin; not to mention, they can look at the git blame and find this PR with its description as well.

@njhale
Copy link
Member Author

njhale commented Mar 24, 2022

@timflannagan are these prow-job failures due to the same resource starvation on AWS we're seeing in OLM?

@timflannagan
Copy link
Member

/retest

@timflannagan
Copy link
Member

It seems like our AWS dev account should be slightly more stable now.

/retest

@timflannagan
Copy link
Member

The o/api PR just landed - we should just be waiting on this marketplace PR to land now, but we could use clusterbot to build a custom release image that we pass to the openshift installer to verify these changes work out-of-band to this PR merging?

@timflannagan
Copy link
Member

openshift/release#27304 moves these prowjobs to GCP.

@timflannagan
Copy link
Member

/test all

@timflannagan
Copy link
Member

/retest-required

@njhale
Copy link
Member Author

njhale commented Mar 28, 2022

/retest

@njhale njhale closed this Mar 29, 2022
@njhale njhale reopened this Mar 29, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 29, 2022

@njhale: The following tests 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/e2e-aws-operator e8193fd link true /test e2e-aws-operator
ci/prow/e2e-aws e8193fd link true /test e2e-aws
ci/prow/e2e-aws-upgrade e8193fd link true /test e2e-aws-upgrade
ci/prow/e2e-aws-console-olm e8193fd link true /test e2e-aws-console-olm
ci/prow/e2e-aws-serial e8193fd link true /test e2e-aws-serial
ci/prow/okd-e2e-aws e8193fd link false /test okd-e2e-aws

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.

@perdasilva
Copy link
Contributor

/test okd-e2e-gcp

@perdasilva
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 30, 2022
@openshift-merge-robot openshift-merge-robot merged commit ddc00e4 into operator-framework:master Mar 30, 2022
@njhale njhale deleted the capability branch March 30, 2022 16:58
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