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(api): add skips/replaces to listbundles api #381

Conversation

ecordell
Copy link
Member

Description of the change:
This adds skip and replace data to the listbundles endpoint.

Motivation for the change:
The (new, sat-solver-based) resolver needs this information so that it can decide what updates are valid for an existing installed operator.

Also, the grpc ecosystem changed since the last codegen, so this commit
includes all of the required tooling changes to generate via the latest tools

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

Sorry, something went wrong.

the resolver needs this information

grpc ecosystem changed since the last codegen, so this commit
also includes all of the required tooling changes to generate
via the latest tools
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 11, 2020
Copy link
Member

@dinhxuanvu dinhxuanvu left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

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

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:
  • OWNERS [dinhxuanvu,ecordell]

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 lgtm Indicates that a PR is ready to be merged. label Jul 11, 2020
@openshift-bot
Copy link
Contributor

/retest

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

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit bcf85b7 into operator-framework:master Jul 11, 2020
@benluddy
Copy link
Contributor

benluddy commented Sep 1, 2020

/cherry-pick release-4.5

@openshift-cherrypick-robot

@benluddy: #381 failed to apply on top of branch "release-4.5":

Applying: feat(api): add skips/replaces to listbundles api
Using index info to reconstruct a base tree...
M	Makefile
M	go.mod
M	go.sum
M	pkg/api/registry.pb.go
M	pkg/api/registry.proto
M	pkg/server/server_test.go
M	pkg/sqlite/query.go
A	vendor/github.com/golang/protobuf/internal/gengogrpc/grpc.go
M	vendor/github.com/golang/protobuf/protoc-gen-go/main.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
CONFLICT (rename/delete): vendor/github.com/golang/protobuf/internal/gengogrpc/grpc.go deleted in HEAD and renamed to vendor/google.golang.org/grpc/cmd/protoc-gen-go-grpc/grpc.go in feat(api): add skips/replaces to listbundles api. Version feat(api): add skips/replaces to listbundles api of vendor/google.golang.org/grpc/cmd/protoc-gen-go-grpc/grpc.go left in tree.
CONFLICT (modify/delete): vendor/github.com/golang/protobuf/protoc-gen-go/main.go deleted in feat(api): add skips/replaces to listbundles api and modified in HEAD. Version HEAD of vendor/github.com/golang/protobuf/protoc-gen-go/main.go left in tree.
Auto-merging pkg/sqlite/query.go
CONFLICT (content): Merge conflict in pkg/sqlite/query.go
Auto-merging pkg/server/server_test.go
CONFLICT (content): Merge conflict in pkg/server/server_test.go
Auto-merging pkg/api/registry.proto
CONFLICT (content): Merge conflict in pkg/api/registry.proto
Auto-merging pkg/api/registry.pb.go
CONFLICT (content): Merge conflict in pkg/api/registry.pb.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 feat(api): add skips/replaces to listbundles api
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.5

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.

benluddy added a commit to benluddy/operator-registry that referenced this pull request Sep 4, 2020

Verified

This commit was signed with the committer’s verified signature.
benluddy Ben Luddy
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.

None yet

7 participants