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

feat(resolver): use provided and required apis from grpc #1101

Merged

Conversation

ecordell
Copy link
Member

@ecordell ecordell commented Oct 31, 2019

Description of the change:

This uses the required/provided apis from the registry api response to do dependency resolution.

The change itself is fairly small, but the diff is slightly larger because I switched the resolver to work directly with the api objects instead of the bundle abstraction (which is less useful if we don't unpack/cache the contents).

Motivation for the change:
Previously, dependency information was extracted from CSVs that were included in the registry response. With bundle images, we will not always have the CSV available.

Instead, the registry extracts this information (it was already extracting provided apis) and sends it as part of the bundle response. OLM trusts this response to know which operators to resolve.

Reviewer Checklist

  • Implementation matches the proposed design, or proposal is updated to match implementation
  • Sufficient unit test coverage
  • Sufficient end-to-end test coverage
  • Docs updated or added to /docs
  • Commit messages sensible and descriptive

@openshift-ci-robot openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 31, 2019
go.mod Outdated
@@ -54,6 +52,8 @@ replace (
github.com/openshift/api => github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b

github.com/operator-framework/operator-registry => ../operator-registry
Copy link

Choose a reason for hiding this comment

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

I assume this was for dev only.

Copy link

Choose a reason for hiding this comment

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

It's back!

@ecordell ecordell force-pushed the resolver-required-apis branch from 8ed2e64 to e0ef09d Compare October 31, 2019 10:56
@ecordell
Copy link
Member Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 31, 2019
@ecordell
Copy link
Member Author

/retest

5 similar comments
@ecordell
Copy link
Member Author

/retest

@ecordell
Copy link
Member Author

/retest

@jpeeler
Copy link

jpeeler commented Oct 31, 2019

/retest

@jpeeler
Copy link

jpeeler commented Oct 31, 2019

/retest

@ecordell
Copy link
Member Author

/retest

@ecordell ecordell force-pushed the resolver-required-apis branch from e0ef09d to 25901bc Compare October 31, 2019 22:26
@ecordell
Copy link
Member Author

/retest

@jpeeler
Copy link

jpeeler commented Oct 31, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 31, 2019
@jpeeler
Copy link

jpeeler commented Oct 31, 2019

/retest

@ecordell
Copy link
Member Author

ecordell commented Nov 1, 2019

/lgtm

@openshift-ci-robot
Copy link
Collaborator

@ecordell: you cannot LGTM your own PR.

In response to this:

/lgtm

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.

@ecordell
Copy link
Member Author

ecordell commented Nov 1, 2019

/retest

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Nov 1, 2019
@ecordell ecordell force-pushed the resolver-required-apis branch from c465add to 25901bc Compare November 1, 2019 02:11
@openshift-ci-robot
Copy link
Collaborator

@ecordell: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/e2e-gcp-upgrade 25901bc link /test e2e-gcp-upgrade
ci/prow/e2e-gcp 25901bc link /test e2e-gcp

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

@jpeeler
Copy link

jpeeler commented Nov 1, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 1, 2019
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ecordell, jpeeler

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

@ecordell
Copy link
Member Author

ecordell commented Nov 1, 2019

This is passing all tests but gcp, which seems to broken everywhere. Merging manually.

@ecordell ecordell merged commit a6e1e93 into operator-framework:master Nov 1, 2019
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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants