Bug 1989712: Fix for resolution error on channels with deprecated inner entries. #2313
Conversation
Resolution would fail with an error in the presence of channels containing more than two entries with a deprecated inner entry (e.g. V1 -> V2 -> V3, with deprecated V2). This was due to special handling that filtered out deprecated bundles at the cache query layer. A channel's complete replaces-chain must be returned from cache queries in order to correctly determine the relative order between entries in the channel. Signed-off-by: Ben Luddy <[email protected]>
openshift-ci
bot
added
bugzilla/severity-high
|
@benluddy: This pull request references Bugzilla bug 1989712, 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. 6 validation(s) were run on this bug
Requesting review from QA contact: In response to this:
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[bot]: GitHub didn't allow me to request PR reviews from the following users: jianzhangbjz. Note that only operator-framework members and repo collaborators can review this PR, and authors cannot review their own PRs. In response to this:
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. |
|
/cherry-pick release-4.6 |
|
@benluddy: once the present PR merges, I will cherry-pick it on top of release-4.6 in a new PR and assign it to you. In response to this:
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. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: benluddy 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 |
openshift-ci
bot
added
the
approved
| func WithoutDeprecatedProperty() OperatorPredicate { | ||
| return func(o *Operator) bool { | ||
| for _, p := range o.bundle.GetProperties() { | ||
| if p.GetType() == opregistry.DeprecatedType { | ||
| return false | ||
| } | ||
| } | ||
| return true | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
Why are we removing this code block? I might be missing something obvious, but I didn't see anything in the 4.8 PR for removing fields from this cache package. Just want to rule out whether this is an artifact of the cherry-pick failing and rebase being needed.
There was a problem hiding this comment.
Link to that block of code in the 4.8 PR: https://github.com/operator-framework/operator-lifecycle-manager/pull/2104/files#diff-5311e3f964b627fa6618423cf9e1ce3f7c84530d3045b93365f1102cea3280b8R464.
There was a problem hiding this comment.
deprecated properties are handled by the solver instead: https://github.com/operator-framework/operator-lifecycle-manager/pull/2313/files/40187e79db7ab1b5fb4b66bcecce198a03f8313f#diff-2c070869d0e7b6bf96c69fbdcde88e430d5d8781e047c1d96cb22ee0967c0111R64-R72
|
/lgtm |
ecordell
added
the
cherry-pick-approved
|
[patch-manager] 🚀 Approved for z-stream by score: 0.50 picked |
|
@benluddy: All pull requests linked via external trackers have merged: Bugzilla bug 1989712 has been moved to the MODIFIED state. In response to this:
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: new pull request created: #2317 In response to this:
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. |
|
/cherry-pick release-4.6 |
|
@kevinrizza: new pull request could not be created: failed to create pull request against operator-framework/operator-lifecycle-manager#release-4.6 from head openshift-cherrypick-robot:cherry-pick-2313-to-release-4.6: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"A pull request already exists for openshift-cherrypick-robot:cherry-pick-2313-to-release-4.6."}],"documentation_url":"https://docs.github.com/rest/reference/pulls#create-a-pull-request"} In response to this:
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. |
|
/cherry-pick release-4.6 |
|
@kevinrizza: new pull request could not be created: failed to create pull request against operator-framework/operator-lifecycle-manager#release-4.6 from head openshift-cherrypick-robot:cherry-pick-2313-to-release-4.6: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"A pull request already exists for openshift-cherrypick-robot:cherry-pick-2313-to-release-4.6."}],"documentation_url":"https://docs.github.com/rest/reference/pulls#create-a-pull-request"} In response to this:
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. |
Resolution would fail with an error in the presence of channels
containing more than two entries with a deprecated inner
entry (e.g. V1 -> V2 -> V3, with deprecated V2). This was due to
special handling that filtered out deprecated bundles at the cache
query layer. A channel's complete replaces-chain must be returned from
cache queries in order to correctly determine the relative order
between entries in the channel.