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

chore(modules): bump openshift/api for new operatorhub crd #472

Merged

Conversation

njhale
Copy link
Member

@njhale njhale commented May 2, 2022

Description of the change:

  • Drop unnecessary replaces directives
  • Bump openshift/api to include the new OperatorHub CRD manifest (w/
    marketplace capability annotation)
  • Update ./vendor

Motivation for the change:

The current version of OpenShift API being vendored contains an old v1beta1 CRD manifest, missing the marketplace capability annotation.

Blocks openshift/cluster-config-operator#245

- Drop unnecessary replaces directives
- Bump openshift/api to include the new OperatorHub CRD manifest (w/
  marketplace capability annotation)
- Update ./vendor

Signed-off-by: Nick Hale <njohnhale@gmail.com>
@openshift-ci openshift-ci bot requested review from dinhxuanvu and exdx May 2, 2022 19:29
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 2, 2022
Copy link

@tylerslaton tylerslaton left a comment

Choose a reason for hiding this comment

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

Wow, those dependencies were over a year old. Do we know if there will be any unintended side effects from this? Should probably keep a close eye on the E2E suite just in case. Regardless, this looks good to me.

/lgtm

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

openshift-ci bot commented May 2, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: njhale, tylerslaton

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

@njhale
Copy link
Member Author

njhale commented May 2, 2022

Do we know if there will be any unintended side effects from this?

There could be. Hopefully our e2e suite will catch this. Already seeing okd-e2e-gcp failing, but I'm not confident it's related.

I'll be on the lookout for subsequent failures.

/retest-required

@openshift-bot
Copy link
Contributor

/retest-required

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

1 similar comment
@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 2, 2022

@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 eca1773 link false /test okd-e2e-gcp

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.

@openshift-bot
Copy link
Contributor

/retest-required

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

2 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
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 12a51a2 into operator-framework:master May 3, 2022
@njhale njhale deleted the bump_openshift/api branch May 3, 2022 15:21
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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants