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

Add additional guards around updates to avoid unnecessary resolution #756

Closed
wants to merge 1 commit into from
Closed

Add additional guards around updates to avoid unnecessary resolution #756

wants to merge 1 commit into from

Conversation

ecordell
Copy link
Member

@ecordell ecordell commented Mar 13, 2019 •
edited
Loading

Things that have changed in this PR:

  • to help prevent issues around updates in the future, guards were added to prevent upgrades when operators aren't currently in a good state. mostly this involves checking that the currentCSV in status == installedCSV in status, and that the installedCSV is in an upgradeable state
  • an interesting side-effect of the guards is that subscriptions now need to have installed/currentCSV at all times. previously, any subscription created because of a resolution would not have those fields (until they were first updated). It seemed sensible to write out a startingCSV on those subscriptions, and then ensure that the startingCSV is persisted to the currentCSV status.

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ecordell

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 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. labels Mar 13, 2019
@ecordell ecordell force-pushed the subscription-multiple-intermediates branch 2 times, most recently from f6feef1 to 594db5b Compare March 14, 2019 12:18
@ecordell ecordell mentioned this pull request Mar 14, 2019
Closed
@openshift-ci-robot openshift-ci-robot added 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 14, 2019
@ecordell ecordell force-pushed the subscription-multiple-intermediates branch from 750b41d to 2b924eb Compare March 15, 2019 11:43
alecmerdler
alecmerdler reviewed Mar 15, 2019
View reviewed changes
test/e2e/subscription_e2e_test.go Outdated
fmt.Println("catalog updated")
return true
}
fmt.Println("waiting for catalog pod to be available")
Copy link
Member

Choose a reason for hiding this comment

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

The gRPC pod may still take some time before it spins up after the CatalogSource is synced, right?

@ecordell ecordell mentioned this pull request Mar 15, 2019
Merged
@ecordell ecordell force-pushed the subscription-multiple-intermediates branch from 2b924eb to 54ca256 Compare March 17, 2019 14:11
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 17, 2019
@ecordell ecordell changed the title Subscriptions step through multiple updates Add additional guards around updates to avoid unnecessary resolution Mar 17, 2019
@ecordell ecordell added the kind/feature Categorizes issue or PR as related to a new feature. label Mar 19, 2019
@alecmerdler
Copy link
Member

/retest

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 24, 2019
@ecordell
Copy link
Member Author

ecordell commented May 9, 2019

/hold

holding until master is open for 4.2 😢

@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 May 9, 2019
@ecordell
Copy link
Member Author

/hold cancel

@ecordell
fix(catalog): add guards to ensure we never attempt to update a sub
acc4b31 
to an operator that doesn't replace the currently running one
@ecordell ecordell force-pushed the subscription-multiple-intermediates branch from 54ca256 to acc4b31 Compare May 21, 2019 16:26
@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 21, 2019
@openshift-ci-robot
Copy link
Collaborator

@ecordell: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/unit acc4b31 link /test unit
ci/prow/e2e-aws-console-olm acc4b31 link /test e2e-aws-console-olm
ci/prow/e2e-aws acc4b31 link /test e2e-aws
ci/prow/e2e-aws-olm acc4b31 link /test e2e-aws-olm
ci/prow/e2e-aws-upgrade acc4b31 link /test e2e-aws-upgrade
ci/prow/images acc4b31 link /test images

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@openshift-ci-robot
Copy link
Collaborator

@ecordell: PR needs rebase.

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 the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 17, 2019
@ecordell ecordell closed this Sep 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alecmerdler alecmerdler alecmerdler left review comments

@jpeeler jpeeler Awaiting requested review from jpeeler

@njhale njhale Awaiting requested review from njhale

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. kind/feature Categorizes issue or PR as related to a new feature. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ecordell @openshift-ci-robot @alecmerdler