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

Bug 1969902: resolver: remove legacy support for fallback parsing of CSVs #135

Merged
merged 1 commit into from Jul 28, 2021

Conversation

joelanford
Copy link
Member

When no APIs or properties are present on bundles, the resolver
currently falls back to a legacy mode where that information is parsed
from CSVs present in the index.

This legacy fallback method causes the resolver to incorrectly identify
multiple heads for a channel when:
a) The index contains CSVs only on channel head bundles, and
b) A package contains two channels, where one channel contains the head
of the other channel and there is at least one other node between
these channel head nodes in that channel.
c) The bundles have no properties, provided APIs, or required APIs

Conditions a) and b) are extremely prevalent, so this bug will often be
encountered whenever c) itself is true.

This commit removes support for the legacy CSV parsing fallback, which
means that only first class fields in the GRPC API will be used during
resolutions.

Signed-off-by: Joe Lanford joe.lanford@gmail.com

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 7fa42934ea0ce5a5f4c589767ce88b8fac7f6c68

When no APIs or properties are present on bundles, the resolver
currently falls back to a legacy mode where that information is parsed
from CSVs present in the index.

This legacy fallback method causes the resolver to incorrectly identify
multiple heads for a channel when:
a) The index contains CSVs only on channel head bundles, and
b) A package contains two channels, where one channel contains the head
   of the other channel and there is at least one other node between
   these channel head nodes in that channel.
c) The bundles have no properties, provided APIs, or required APIs

Conditions a) and b) are extremely prevalent, so this bug will often be
encountered whenever c) itself is true.

This commit removes support for the legacy CSV parsing fallback, which
means that only first class fields in the GRPC API will be used during
resolutions.

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 7fa42934ea0ce5a5f4c589767ce88b8fac7f6c68
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 27, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: joelanford

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 27, 2021
@joelanford joelanford changed the title [Bug 1969902] resolver: remove legacy support for fallback parsing of CSVs Bug 1969902: resolver: remove legacy support for fallback parsing of CSVs Jul 27, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 27, 2021

@joelanford: This pull request references Bugzilla bug 1969902, which is invalid:

  • expected the bug to target the "4.9.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1969902: resolver: remove legacy support for fallback parsing of CSVs

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 openshift-ci bot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jul 27, 2021
@joelanford
Copy link
Member Author

/bugzilla refresh

@openshift-ci openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jul 27, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 27, 2021

@joelanford: This pull request references Bugzilla bug 1969902, 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.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.9.0) matches configured target release for branch (4.9.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

/bugzilla refresh

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 openshift-ci bot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Jul 27, 2021
@openshift-ci openshift-ci bot requested a review from jianzhangbjz July 27, 2021 16:28
@joelanford
Copy link
Member Author

/cherry-pick release-4.8

@openshift-cherrypick-robot

@joelanford: once the present PR merges, I will cherry-pick it on top of release-4.8 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.8

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.

@joelanford
Copy link
Member Author

/retest

@timflannagan
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 27, 2021
@openshift-bot
Copy link
Contributor

/retest-required

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

3 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-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 088bd07 into openshift:master Jul 28, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 28, 2021

@joelanford: All pull requests linked via external trackers have merged:

Bugzilla bug 1969902 has been moved to the MODIFIED state.

In response to this:

Bug 1969902: resolver: remove legacy support for fallback parsing of CSVs

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-cherrypick-robot

@joelanford: #135 failed to apply on top of branch "release-4.8":

Applying: resolver: remove legacy support for fallback parsing of CSVs
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/pkg/controller/registry/resolver/operators.go
M	staging/operator-lifecycle-manager/pkg/controller/registry/resolver/operators_test.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/operators.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/operators.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/operators.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/registry/resolver/operators_test.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/registry/resolver/operators_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/registry/resolver/operators.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/registry/resolver/operators.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 resolver: remove legacy support for fallback parsing of CSVs
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.8

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-cherrypick-robot

@joelanford: #135 failed to apply on top of branch "release-4.8":

Applying: resolver: remove legacy support for fallback parsing of CSVs
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/pkg/controller/registry/resolver/operators.go
M	staging/operator-lifecycle-manager/pkg/controller/registry/resolver/operators_test.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/operators.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/operators.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/operators.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/registry/resolver/operators_test.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/registry/resolver/operators_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/registry/resolver/operators.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/registry/resolver/operators.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 resolver: remove legacy support for fallback parsing of CSVs
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.8

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.

@joelanford joelanford deleted the bz-1969902 branch August 25, 2021 23:48
anik120 pushed a commit to anik120/operator-framework-olm that referenced this pull request Dec 9, 2021
* add storage spec to scorecard config

(cherry picked from commit e245efd8031e64958764253d6411e6d186911298)

* Run make generate

* Add godocs

Co-authored-by: jmccormick2001 <jemccorm@redhat.com>

Upstream-repository: api
Upstream-commit: da186270e3db3fed9cc1b1d36708114e683c5308
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. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. 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

5 participants