Skip to content

Conversation

@adellape
Copy link
Contributor

@adellape adellape commented Oct 8, 2020

@adellape adellape added this to the Next Release milestone Oct 8, 2020
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 8, 2020
@openshift-docs-preview-bot

The preview will be available shortly at:

@codyhoag codyhoag self-requested a review October 9, 2020 00:33
Copy link
Contributor

@codyhoag codyhoag left a comment

Choose a reason for hiding this comment

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

LGTM!

@codyhoag codyhoag added the peer-review-done Signifies that the peer review team has reviewed this PR label Oct 9, 2020
@jianzhangbjz
Copy link
Member

/assign @jianzhangbjz

@jianzhangbjz
Copy link
Member

That's perfect, looks good to me, thanks! But I didn't find an introduction to the upgrade for the same channel.
I'm not sure if it should be list in this doc. But, anyway, I list it here, actually, this is a feature for the CatalogSource Polling, here is the related test case OCP-27672.
For the upgrade in the same channel, if you subscribe to the operator with Automatic, the installed operator will be upgraded automatically once the Index image updated.
For the Manual way, the installed operator will be upgraded after your approval, like this:
image

@adellape
Copy link
Contributor Author

That's perfect, looks good to me, thanks! But I didn't find an introduction to the upgrade for the same channel.

@jianzhangbjz Thank you! I guess I was thinking the couple spots where it's mentioned "If the approval strategy in the Subscription is set to Automatic, the upgrade process initiates immediately" or similar covered that scenario. The title "Manually approving a pending Operator upgrade" is specifically about "manually" approving, and there wouldn't really be a procedure for the automatic scenario.

I'm opening to adding another section more explicitly about that scenario if it's more clear though. I'll move this PR along for now, and can revisit in a follow-up, if needed.

@adellape adellape force-pushed the upgrade_operators branch 7 times, most recently from 156e0ad to b7362f3 Compare October 12, 2020 18:52
@adellape adellape merged commit 6fa21b2 into openshift:master Oct 12, 2020
@adellape adellape deleted the upgrade_operators branch October 12, 2020 19:52
@adellape
Copy link
Contributor Author

adellape commented Oct 12, 2020

/cherrypick enterprise-4.5

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 12, 2020

@adellape: #26272 failed to apply on top of branch "enterprise-4.5":

Applying: Add "Upgrading installed Operators"
Using index info to reconstruct a base tree...
M	_topic_map.yml
Falling back to patching base and 3-way merge...
Auto-merging _topic_map.yml
CONFLICT (content): Merge conflict in _topic_map.yml
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 "Upgrading installed Operators"
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".

Details

In response to this:

/cherrypick enterprise-4.5

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.

@adellape
Copy link
Contributor Author

adellape commented Oct 12, 2020

/cherrypick enterprise-4.6

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Oct 12, 2020

@adellape: new pull request created: #26360

Details

In response to this:

/cherrypick enterprise-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.

@jianzhangbjz
Copy link
Member

@adellape Thanks! For this PR, it's only for how to update the operator for different channels. But, actually, if the users want to upgrade the operator in the same channel, they just need to update the Index (CatalogSource) image, and no need to change the Subscription. I guess we should add this point somewhere.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.5 branch/enterprise-4.6 peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants