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.

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

Bug 1934637: Honor all subscriptions to a package #2026

Merged
merged 5 commits into from Mar 13, 2021
Merged

Bug 1934637: Honor all subscriptions to a package #2026

merged 5 commits into from Mar 13, 2021

Conversation

benluddy
Copy link
Contributor

@benluddy benluddy commented Mar 3, 2021

Cherry-pick of #2009 to release-4.6.

@openshift-ci-robot
Copy link
Collaborator

@benluddy: This pull request references Bugzilla bug 1934637, which is invalid:

  • expected dependent Bugzilla bug 1932002 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is MODIFIED 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.6] Bug 1934637: 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-ci-robot openshift-ci-robot added bugzilla/severity-high Referenced Bugzilla bug's severity is high 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 Mar 3, 2021
@openshift-ci-robot
Copy link
Collaborator

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 3, 2021
@benluddy
Copy link
Contributor Author

benluddy commented Mar 3, 2021

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 3, 2021
benluddy and others added 5 commits March 3, 2021 13:55
@benluddy
Clarify subscription constraint strings in resolution failures.
1946a74 
ResolutionFailed events exposed internal terminology (i.e. "mandatory"
and "dependency") directly to users. Common constraints applied to
subscriptions appeared as "PACKAGE is mandatory" or "PACKAGE has a
dependency without any candidates to satisfy it", which in practice
meant "a subscription to PACKAGE exists in the namespace" and "no
operators found matching the criteria of the subscription to PACKAGE",
respectively. The language of these Subscription-related constraint
strings now better reflects what they mean to users.

Signed-off-by: Ben Luddy <bluddy@redhat.com>
@benluddy
Add meaningful string representations for resolution invariants.
9f22590 
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>
@ecordell @benluddy
collapse resolver tests
e3ce185 
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>
@ecordell @benluddy
add package property to unit test cases
10a2856 
without this, some of the invariant checking
was being missed by the unit tests

Signed-off-by: Evan <cordell.evan@gmail.com>
@ecordell @benluddy
support multiple subscriptions resolving the same bundles
ed1e00b 
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>
@benluddy
Copy link
Contributor Author

benluddy commented Mar 5, 2021

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Mar 5, 2021
@openshift-ci-robot
Copy link
Collaborator

@benluddy: This pull request references Bugzilla bug 1934637, 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.6.z) matches configured target release for branch (4.6.z)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1932002 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1932002 targets the "4.7.z" release, which is one of the valid target releases: 4.7.0, 4.7.z
  • 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 openshift-ci-robot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Mar 5, 2021
@benluddy
Copy link
Contributor Author

benluddy commented Mar 5, 2021

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 5, 2021
@njhale
Copy link
Member

njhale commented Mar 5, 2021

/lgtm

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. and removed lgtm Indicates that a PR is ready to be merged. labels Mar 5, 2021
@njhale
Copy link
Member

njhale commented Mar 5, 2021

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 5, 2021
@crawford crawford changed the title [release-4.6] Bug 1934637: Only one of multiple subscriptions to the same package is honored Bug 1934637: Honor all subscriptions to a package Mar 10, 2021
@crawford crawford added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 10, 2021
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

6 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@crawford crawford removed the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 11, 2021
@crawford
Copy link

CI failed six times in a row. @benluddy could you take a look?

@crawford
Copy link

Hmmm, aside from the first failure, these seem to be related to a recent CI outage.

@crawford crawford added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 11, 2021
@crawford
Copy link

/retest

2 similar comments
@crawford
Copy link

/retest

@joelanford
Copy link
Member

/retest

@openshift-bot
Copy link
Contributor

/retest

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

2 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@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 ea0bfca into operator-framework:release-4.6 Mar 13, 2021
@openshift-ci-robot
Copy link
Collaborator

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

Bugzilla bug 1934637 has been moved to the MODIFIED state.

In response to this:

Bug 1934637: Honor all subscriptions to a package

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.

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

@dinhxuanvu dinhxuanvu Awaiting requested review from dinhxuanvu

Assignees

@njhale njhale

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@benluddy @openshift-ci-robot @njhale @openshift-bot @crawford @joelanford @openshift-merge-robot @ecordell