Skip to content

WIP: Catalog Source weighting for dependency resolution #1681

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 40 commits into from
Closed

WIP: Catalog Source weighting for dependency resolution #1681

wants to merge 40 commits into from

Conversation

harishsurf
Copy link
Contributor

Description of the change:

Motivation for the change:

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

kevinrizza and others added 30 commits July 22, 2020 09:01
@kevinrizza @ecordell
(feat): Add sat resolver for version dependencies
ef888a2 
Added a resolver to hook up the new sat solver package. This enables
much more complex dependency resolution and initially gives users the
ability to define dependencies based on operator version instead of
purely GVK dependencies

For now, on a command line feature flag. Disabled by default
@dinhxuanvu @ecordell
Extract dependencies info from bundle and add to Operator object
be63c21 
Currently, the dependencies info is extracted from api.Bundle and
add to VersionDependencies field of Operator. As a result, that field
is always empty. The resolver will not be able to resolve package
dependencies.

Signed-off-by: Vu Dinh <[email protected]>
@kevinrizza @ecordell
Strip plural from APISets in resolver cache
180cd1d
@dinhxuanvu @ecordell
Fix unit tests and add GVK dependencies extraction
be5dd33 
If GVK dependencies exist in bundle, extract those dependencies and
add them as RequiredAPIs in operator.

Signed-off-by: Vu Dinh <[email protected]>
@benluddy @ecordell
Adapt resolver unit tests to run with both implementations.
dfcdbca
@ecordell
use new solver interface in satresolver
0da2b35
@ecordell
support semver ranges
5cb0eee
@ecordell
memoize bundle walking
7e801b2
@benluddy @ecordell
Decouple filter predicates from the operator cache itself.
2981128
@ecordell
don't mark virtual package nodes visited
0d3121b
@ecordell
chore(deps): bump operator-registry
ed45229
@ecordell
resolver can resolve updates
c21d3e8
@ecordell
use cardinality-based AtMost constraint
ac8b60c
@ecordell
move csvname filter to a predicate when finding bundles in the cache
7c321c6
@ecordell
search for operators in catalog order
9acfb8f
@ecordell
test updating to a package with skiprange that is not head
afe28d7
@ecordell
split old/new resolver and tests
b18909d
@ecordell
pin etcd and grpc
d533b62
@ecordell
support startingCSV
8868dea
@ecordell
support skip list in bundles
73842c7
@ecordell
refactor dependency walking to avoid recursing
db02e7a
@ecordell
treat dependencies generically
fb40664
@ecordell
rename solve package
53ed8f8
@ecordell
renaming / refactoring
d9f11df 
this should make it simple to remove the old resolver when the time
is right
@ecordell
ensure cache is filled with content before marking it as not a miss
a66dc41
@ecordell
fix verify
48fbb82
@ecordell
wip: fixing resolver tests
399feaa
@ecordell
fix nested dependency resolution
6141359
@ecordell
fix resolver bugs, fix cache race, and re-enable tests
a2f42b0
@ecordell
prefer the same catalog for dependencies
bb1c762
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 24, 2020
@openshift-ci-robot
Copy link
Collaborator

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

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: harishsurf
To complete the pull request process, please assign ecordell
You can assign the PR to them by writing /assign @ecordell in a comment when ready.

The full list of commands accepted by this bot can be found 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-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 24, 2020
@openshift-ci-robot
Copy link
Collaborator

@harishsurf: PR needs rebase.

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.

@harishsurf harishsurf changed the title Catsrc priority WIP: Catalog Source weighting for dependency resolution Jul 24, 2020
@ecordell ecordell force-pushed the new-resolver branch 2 times, most recently from 807be79 to e74f576 Compare July 26, 2020 10:51
@harishsurf
Copy link
Contributor Author

Work is done as part of #1682

@harishsurf harishsurf closed this Jul 27, 2020
@harishsurf harishsurf deleted the catsrc-priority branch August 12, 2020 14:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@awgreene awgreene Awaiting requested review from awgreene

@gallettilance gallettilance Awaiting requested review from gallettilance

Assignees
No one assigned
Labels
do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@harishsurf @openshift-ci-robot @kevinrizza @dinhxuanvu @benluddy @ecordell