Bug 2082763: Drop the OperatorHub CR instance by njhale · Pull Request #245 · openshift/cluster-config-operator

njhale · 2022-04-13T17:53:28Z

Bump and vendor openshift/api to include a renaming of the OperatorHub
CRD yaml. This will preclude the CRD from cluster-config-operator's
CVO manifests and is part of an effort to make the marketplace-operator
optional via OpenShift's capabilities feature. (openshift/api was bumped in another PR)
Drop the OperatorHub CR instance

openshift-ci · 2022-04-13T17:53:52Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

njhale · 2022-04-13T19:21:55Z

/hold

on operator-framework/operator-marketplace#468

njhale · 2022-04-19T14:33:21Z

/hold cancel

The PR this was blocked on has merged.

tylerslaton · 2022-04-19T14:58:49Z

Approach looks good and the vendor changes came through well.

/lgtm

awgreene · 2022-04-19T15:35:16Z

I support the changes here, but we will need to ask QE to update the OpenShift documentation which states that it ships with an operatorhub resource named cluster. Instead, we'll need this section to ask that the user manually create the resource.

I was a bit worried that Marketplace won't behave as expected if the default operatorhub resource is not present, but this code indicates that the default catalogSources would be created as expected.

I don't have approval permissions in this repo, but I'll give my support!
/approve

njhale · 2022-04-19T21:12:25Z

I support the changes here, but we will need to ask QE to update the OpenShift documentation which states that it ships with an operatorhub resource named cluster. Instead, we'll need this section to ask that the user manually create the resource.

I was a bit worried that Marketplace won't behave as expected if the default operatorhub resource is not present, but this code indicates that the default catalogSources would be created as expected.

I don't have approval permissions in this repo, but I'll give my support!
/approve

The operatorhub CRD is now included in marketplace as part of it's CVO manifests; i.e. it's all or nothing anyway.

awgreene · 2022-04-19T21:25:32Z

I support the changes here, but we will need to ask QE to update the OpenShift documentation which states that it ships with an operatorhub resource named cluster. Instead, we'll need this section to ask that the user manually create the resource.
I was a bit worried that Marketplace won't behave as expected if the default operatorhub resource is not present, but this code indicates that the default catalogSources would be created as expected.
I don't have approval permissions in this repo, but I'll give my support!
/approve

The operatorhub CRD is now included in marketplace as part of it's CVO manifests; i.e. it's all or nothing anyway.

Ah I did not know that the cluster operatorhub CR was moved to the Marketplace repo, sgtm.

njhale · 2022-04-29T02:39:37Z

/retest-required

wking · 2022-04-30T01:57:24Z

/retest-required

njhale · 2022-05-02T19:59:42Z

/hold

I believe this is blocked on operator-framework/operator-marketplace#472

TL;DR, It seems like we're depending on an old version of openshift/api in marketplace, which means that the CRD manifest is old and is hitting some relatively new logic in CVO that prevents manifests w/o annotations from being merged. I suspect that bumping and revendoring openshift/api in marketplace will resolve this issue.

njhale · 2022-05-03T15:22:53Z

/retest-required

njhale · 2022-05-03T18:00:19Z

/hold cancel

exdx · 2022-05-04T19:35:43Z

/lgtm

openshift-ci · 2022-05-04T20:52:43Z

@njhale: all tests passed!

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.

wking · 2022-05-08T05:36:34Z

/retitle Bug 2082763: Drop the OperatorHub CR instance

openshift-ci · 2022-05-08T05:36:43Z

@njhale: This pull request references Bugzilla bug 2082763, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.11.0) matches configured target release for branch (4.11.0)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @jianzhangbjz

Details

In response to this:

Bug 2082763: Drop the OperatorHub CR instance

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.

jianzhangbjz · 2022-05-10T09:05:19Z

Hi, I couldn't test it before merging via the cluster-bot since it doesn't support setting the baselineCapabilitySet: None flag at the install time, please move it on, thanks!

bparees · 2022-05-10T13:20:00Z

Hi, I couldn't test it before merging via the cluster-bot since it doesn't support setting the baselineCapabilitySet: None flag at the install time, please move it on, thanks!

you can produce a payload from this PR using cluster-bot, and then do your own install w/ the None capset, right?

perdasilva · 2022-05-11T12:44:59Z

@kevinrizza Hey guys, what's missing for this to get merged? Manual testing by Jian? Could I ask that we please make this a priority. It would be great if we could get in asap, before Friday. Is there anything we can do to help expedite it?

tkashem · 2022-05-11T18:27:11Z

/approve

tkashem · 2022-05-11T18:31:53Z

holding it until qe finishes their testing, feel free to cancel the hold once qe is happy

/hold

bparees · 2022-05-11T18:43:42Z

@jianzhangbjz are you able to test this by using cluster-bot to build a payload from this PR, and then install from that payload w/ the None capset?

jianzhangbjz · 2022-05-12T00:08:03Z

@bparees Hi, I'm PTO yesterday, will try it today, thanks!

jianzhangbjz · 2022-05-12T10:10:54Z

LGTM based on https://bugzilla.redhat.com/show_bug.cgi?id=2082763#c5
/lgtm

jianzhangbjz · 2022-05-12T10:11:12Z

/unhold

jianzhangbjz · 2022-05-12T10:13:06Z

@tkashem Could you help /unhold it? Thanks!

openshift-ci · 2022-05-12T10:15:15Z

@njhale: All pull requests linked via external trackers have merged:

openshift/cluster-config-operator#245

Bugzilla bug 2082763 has been moved to the MODIFIED state.

Details

In response to this:

Bug 2082763: Drop the OperatorHub CR instance

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.

openshift-ci · 2022-05-12T10:15:18Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awgreene, bparees, exdx, jianzhangbjz, njhale, tkashem, tylerslaton

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:

~~OWNERS~~ [tkashem]

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

openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 13, 2022

njhale commented Apr 13, 2022

View reviewed changes

Comment thread empty-resources/0000_05_config-operator_02_operatorhub.cr.yaml Outdated

openshift-ci Bot requested review from mfojtik and soltysh April 13, 2022 17:54

njhale force-pushed the fix/vendor-api branch from a3ba4b5 to d99d66a Compare April 13, 2022 19:15

njhale marked this pull request as ready for review April 13, 2022 19:21

openshift-ci Bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Apr 13, 2022

openshift-ci Bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Apr 13, 2022

openshift-ci Bot requested a review from tkashem April 13, 2022 19:23

njhale mentioned this pull request Apr 13, 2022

fix(manifests): add singleton operatorhub cr operator-framework/operator-marketplace#468

Merged

njhale force-pushed the fix/vendor-api branch from d99d66a to 481e214 Compare April 19, 2022 14:31

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 19, 2022

openshift-ci Bot assigned tylerslaton Apr 19, 2022

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

njhale mentioned this pull request May 2, 2022

chore(modules): bump openshift/api for new operatorhub crd operator-framework/operator-marketplace#472

Merged

openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 2, 2022

openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label May 4, 2022

njhale changed the title ~~Bump(o/api): drop operatorhub crd yaml~~ Drop the OperatorHub CR instance May 4, 2022

openshift-ci Bot assigned exdx May 4, 2022

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

openshift-ci Bot changed the title ~~Drop the OperatorHub CR instance~~ Bug 2082763: Drop the OperatorHub CR instance May 8, 2022

openshift-ci Bot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels May 8, 2022

openshift-ci Bot requested a review from jianzhangbjz May 8, 2022 05:36

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 11, 2022

openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 11, 2022

openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 12, 2022

openshift-ci Bot assigned jianzhangbjz May 12, 2022

openshift-merge-robot merged commit 2faeea8 into openshift:master May 12, 2022

wking mentioned this pull request May 12, 2022

fix(olm): remove dependency on marketplace-provided content openshift/origin#26993

Closed

Conversation

njhale commented Apr 13, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci Bot commented Apr 13, 2022

Uh oh!

Uh oh!

njhale commented Apr 13, 2022

Uh oh!

njhale commented Apr 19, 2022

Uh oh!

tylerslaton commented Apr 19, 2022

Uh oh!

awgreene commented Apr 19, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

njhale commented Apr 19, 2022

Uh oh!

awgreene commented Apr 19, 2022

Uh oh!

njhale commented Apr 29, 2022

Uh oh!

wking commented Apr 30, 2022

Uh oh!

njhale commented May 2, 2022

Uh oh!

njhale commented May 3, 2022

Uh oh!

njhale commented May 3, 2022

Uh oh!

exdx commented May 4, 2022

Uh oh!

openshift-ci Bot commented May 4, 2022

Uh oh!

wking commented May 8, 2022

Uh oh!

openshift-ci Bot commented May 8, 2022

Uh oh!

jianzhangbjz commented May 10, 2022

Uh oh!

bparees commented May 10, 2022

Uh oh!

perdasilva commented May 11, 2022

Uh oh!

tkashem commented May 11, 2022

Uh oh!

tkashem commented May 11, 2022

Uh oh!

bparees commented May 11, 2022

Uh oh!

jianzhangbjz commented May 12, 2022

Uh oh!

jianzhangbjz commented May 12, 2022

Uh oh!

jianzhangbjz commented May 12, 2022

Uh oh!

jianzhangbjz commented May 12, 2022

Uh oh!

openshift-ci Bot commented May 12, 2022

Uh oh!

openshift-ci Bot commented May 12, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

njhale commented Apr 13, 2022 •

edited

Loading

awgreene commented Apr 19, 2022 •

edited

Loading