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

Subscription steps through multiple upgrades #761

Merged

Conversation

ecordell
Copy link
Member

This pulls out a subset of commits from #756 that omits the additional guards around when we attempt to update (they had farther reaching effects that will take a while to test/verify).

step through multiple intermediate versions

we have tests for this for CSVs, but not one for subscriptions.
this prevents detecting two updates to the same operator during one
resolution
the test was previously asserting that we would resolve a subscription
for an existing csv, which is wrong. if the csv exists in the cluster,
we leave it alone (but still consider it's depended/provided apis when
resolviing).
@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 15, 2019
@ecordell
Copy link
Member Author

/test e2e-aws-olm

@ecordell
Copy link
Member Author

/retest

@ecordell
Copy link
Member Author

/test e2e-aws-olm

@ecordell ecordell force-pushed the multiple-upgrades branch 2 times, most recently from 5b6ba86 to 36d470a Compare March 16, 2019 16:06
@ecordell ecordell force-pushed the multiple-upgrades branch from 36d470a to c18727b Compare March 16, 2019 17:28
ownerlabel for roles/rolebindings were missing the kind label,
which is used in the selector to determine which roles/bindings are
owned by the operator.

this fixes a bug where roles/rolebindings would not be lifted to
clusterroles/bindings when installed into a global operatorgroup
yet been created

this should prevent some churn and possible races
@ecordell ecordell force-pushed the multiple-upgrades branch from c18727b to 3e1ca71 Compare March 16, 2019 21:46
@@ -140,10 +140,12 @@ func (o *Operator) Run(stopc <-chan struct{}) (ready, done chan struct{}, atLeve
o.Log.Info("starting workers...")
for _, queueInformer := range o.queueInformers {
go o.worker(queueInformer)
go o.worker(queueInformer)
}
Copy link

Choose a reason for hiding this comment

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

Why is this addition and below necessary?

@jpeeler
Copy link

jpeeler commented Mar 17, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 17, 2019
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

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

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-merge-robot openshift-merge-robot merged commit 9febd60 into operator-framework:master Mar 17, 2019
@ecordell ecordell deleted the multiple-upgrades branch March 17, 2019 14:08
@ecordell ecordell removed kind/bug Categorizes issue or PR as related to a bug. labels Mar 19, 2019
@njhale njhale added the kind/bug Categorizes issue or PR as related to a bug. label Mar 19, 2019
@ecordell ecordell added kind/bug Categorizes issue or PR as related to a bug. and removed kind/bug Categorizes issue or PR as related to a bug. labels Mar 19, 2019
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. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants