[release-4.7] Bug 1932002: Only one of multiple subscriptions to the same package is honored #2009

openshift-cherrypick-robot · 2021-02-15T22:16:17Z

This is an automated cherry-pick of #2005

/assign ecordell

During dependency resolution, invariants are enforced for one-operator-per-package and one-provider-per-api. Their user-facing string representation (shown when they prevent resolution from succeeding) had re-used the same representation as constraints on Subscriptions out of convenience. Recently, the messaging of Subscription-related constraints was changed to be more descriptive which inadvertently made the invariant messaging misleading. This patch improves constraint messaging for all dependency relationships except bundle dependencies. Signed-off-by: Ben Luddy <bluddy@redhat.com>

there are no longer two resolvers, so having a separate shared set of test cases doesn't make sense (and means the resolver tests look different from all of the other unit tests) Signed-off-by: Evan <cordell.evan@gmail.com>

without this, some of the invariant checking was being missed by the unit tests Signed-off-by: Evan <cordell.evan@gmail.com>

this better aligns the on-cluster status with the output of the resolver we may want to prevent this case from happening at a higher layer (i.e. a webhook that prevents two subscriptions to the same package), but for now this behavior ensures that the actions the resolver takes are clearly visible in the subscription status. this also adds test cases for multiple subscriptions to the same package Signed-off-by: Evan <cordell.evan@gmail.com>

dinhxuanvu

/lgtm

openshift-ci-robot · 2021-02-17T21:25:42Z

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1929904, 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

bug is open, matching expected state (open)
bug target release (4.7.0) matches configured target release for branch (4.7.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1921953 is in the state MODIFIED, which is one of the valid states (MODIFIED, VERIFIED)
dependent Bugzilla bug 1921953 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
bug has dependents

In response to this:

[release-4.7] Bug 1929904: Add meaningful string representations for resolution invariants

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.

dinhxuanvu · 2021-02-17T21:25:48Z

/bugzilla refresh

openshift-ci-robot · 2021-02-17T21:25:52Z

@dinhxuanvu: This pull request references Bugzilla bug 1929904, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.0) matches configured target release for branch (4.7.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1921953 is in the state MODIFIED, which is one of the valid states (MODIFIED, VERIFIED)
dependent Bugzilla bug 1921953 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
bug has dependents

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-robot · 2021-02-22T19:33:35Z

@openshift-cherrypick-robot: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.7] Add meaningful string representations for resolution invariants

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-robot · 2021-02-23T18:29:11Z

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1932002, which is invalid:

expected the bug to target the "4.7.0" release, but it targets "4.7.z" 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:

[release-4.7] Bug 1932002: Add meaningful string representations for resolution invariants

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 · 2021-02-23T18:34:54Z

/cherry-pick release-4.6

openshift-cherrypick-robot · 2021-02-23T18:34:55Z

@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:

/cherry-pick release-4.6

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-bot · 2021-02-24T01:01:07Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2021-02-24T01:01:11Z

@openshift-bot: This pull request references Bugzilla bug 1932002, which is invalid:

expected the bug to target the "4.7.0" release, but it targets "4.7.z" instead
expected dependent Bugzilla bug 1932001 to be in one of the following states: MODIFIED, VERIFIED, but it is ON_QA 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:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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-bot · 2021-02-25T01:00:23Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2021-02-25T01:00:31Z

@openshift-bot: This pull request references Bugzilla bug 1932002, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.z) matches configured target release for branch (4.7.z)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1932001 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
dependent Bugzilla bug 1932001 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
bug has dependents

In response to this:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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 · 2021-02-25T04:58:23Z

/approve

openshift-ci-robot · 2021-02-25T04:58:33Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: benluddy, dinhxuanvu, openshift-cherrypick-robot

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~~ [benluddy]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

benluddy · 2021-03-01T18:39:53Z

/bugzilla refresh

openshift-ci-robot · 2021-03-01T18:40:02Z

@benluddy: This pull request references Bugzilla bug 1932002, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.z) matches configured target release for branch (4.7.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1932001 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
dependent Bugzilla bug 1932001 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
bug has dependents

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-bot · 2021-03-03T02:18:09Z

/retest

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

openshift-bot · 2021-03-03T02:43:33Z

/retest

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

openshift-ci-robot · 2021-03-03T04:22:23Z

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

operator-framework/operator-lifecycle-manager#2009

Bugzilla bug 1932002 has been moved to the MODIFIED state.

In response to this:

[release-4.7] Bug 1932002: Only one of multiple subscriptions to the same package is honored

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 · 2021-03-03T04:22:58Z

@benluddy: #2009 failed to apply on top of branch "release-4.6":

Applying: Add meaningful string representations for resolution invariants.
Using index info to reconstruct a base tree...
M	pkg/controller/registry/resolver/installabletypes.go
M	pkg/controller/registry/resolver/resolver.go
M	pkg/controller/registry/resolver/resolver_test.go
M	pkg/controller/registry/resolver/step_resolver_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/registry/resolver/step_resolver_test.go
CONFLICT (content): Merge conflict in pkg/controller/registry/resolver/step_resolver_test.go
Auto-merging pkg/controller/registry/resolver/resolver_test.go
Auto-merging pkg/controller/registry/resolver/resolver.go
Auto-merging pkg/controller/registry/resolver/installabletypes.go
CONFLICT (content): Merge conflict in pkg/controller/registry/resolver/installabletypes.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 Add meaningful string representations for resolution invariants.
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.6

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 and others added 4 commits February 15, 2021 22:16

collapse resolver tests

6f69458

there are no longer two resolvers, so having a separate shared set of test cases doesn't make sense (and means the resolver tests look different from all of the other unit tests) Signed-off-by: Evan <cordell.evan@gmail.com>

add package property to unit test cases

2cd185d

without this, some of the invariant checking was being missed by the unit tests Signed-off-by: Evan <cordell.evan@gmail.com>

openshift-ci-robot assigned ecordell Feb 15, 2021

openshift-cherrypick-robot mentioned this pull request Feb 15, 2021

Bug 1932001: Add meaningful string representations for resolution invariants #2005

Merged

5 tasks

openshift-ci-robot requested review from anik120 and awgreene February 15, 2021 22:16

dinhxuanvu approved these changes Feb 16, 2021

View reviewed changes

openshift-ci-robot assigned dinhxuanvu Feb 16, 2021

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 16, 2021

dinhxuanvu changed the title ~~[release-4.7] Add meaningful string representations for resolution invariants~~ [release-4.7] Bug 1929904: Add meaningful string representations for resolution invariants Feb 17, 2021

openshift-ci-robot added bugzilla/severity-high Referenced Bugzilla bug's severity is high 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. labels Feb 17, 2021

benluddy changed the title ~~[release-4.7] Bug 1929904: Add meaningful string representations for resolution invariants~~ [release-4.7] Add meaningful string representations for resolution invariants Feb 22, 2021

openshift-ci-robot removed the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Feb 22, 2021

openshift-ci-robot removed the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Feb 22, 2021

benluddy changed the title ~~[release-4.7] Add meaningful string representations for resolution invariants~~ [release-4.7] Bug 1932002: Add meaningful string representations for resolution invariants Feb 23, 2021

openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Feb 23, 2021

openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Feb 23, 2021

openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Feb 25, 2021

benluddy changed the title ~~[release-4.7] Bug 1932002: Add meaningful string representations for resolution invariants~~ [release-4.7] Bug 1932002: Only one of multiple subscriptions to the same package is honored Feb 25, 2021

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 25, 2021

openshift-ci-robot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. and removed bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. labels Mar 1, 2021

benluddy mentioned this pull request Mar 1, 2021

[release-4.7] Bug 1929904: Infer package name property for unannotated CSVs, if possible. #2020

Closed

mrunalp added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 2, 2021

openshift-merge-robot merged commit 45ee0b4 into operator-framework:release-4.7 Mar 3, 2021

benluddy mentioned this pull request Mar 3, 2021

Bug 1934637: Honor all subscriptions to a package #2026

Merged

[release-4.7] Bug 1932002: Only one of multiple subscriptions to the same package is honored #2009

[release-4.7] Bug 1932002: Only one of multiple subscriptions to the same package is honored #2009

Uh oh!

Conversation

openshift-cherrypick-robot commented Feb 15, 2021

Uh oh!

dinhxuanvu left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci-robot commented Feb 17, 2021

Uh oh!

dinhxuanvu commented Feb 17, 2021

Uh oh!

openshift-ci-robot commented Feb 17, 2021

Uh oh!

openshift-ci-robot commented Feb 22, 2021

Uh oh!

openshift-ci-robot commented Feb 23, 2021

Uh oh!

benluddy commented Feb 23, 2021

Uh oh!

openshift-cherrypick-robot commented Feb 23, 2021

Uh oh!

openshift-bot commented Feb 24, 2021

Uh oh!

openshift-ci-robot commented Feb 24, 2021

Uh oh!

openshift-bot commented Feb 25, 2021

Uh oh!

openshift-ci-robot commented Feb 25, 2021

Uh oh!

benluddy commented Feb 25, 2021

Uh oh!

openshift-ci-robot commented Feb 25, 2021

Uh oh!

benluddy commented Mar 1, 2021

Uh oh!

openshift-ci-robot commented Mar 1, 2021

Uh oh!

openshift-bot commented Mar 3, 2021

Uh oh!

openshift-bot commented Mar 3, 2021

Uh oh!

openshift-ci-robot commented Mar 3, 2021

Uh oh!

openshift-cherrypick-robot commented Mar 3, 2021

Uh oh!

Uh oh!