Skip to content

Conversation

@kcarmichael08
Copy link
Contributor

Version(s):

  • merge to rhacs-docs
  • cherry pick to rhacs-docs-4.2
  • cherry pick to rhacs-docs-4.1
  • cherry pick to rhacs-docs-4.0

Issue

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 14, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 14, 2023

@kcarmichael08: This pull request references ROX-18976 which is a valid jira issue.

In response to this:

Version(s):

  • merge to rhacs-docs
  • cherry pick to rhacs-docs-4.2
  • cherry pick to rhacs-docs-4.1
  • cherry pick to rhacs-docs-4.0

Issue

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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 openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 14, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Aug 14, 2023

🤖 Updated build preview is available at:
https://63530--docspreview.netlify.app

Build log: https://circleci.com/gh/ocpdocs-previewbot/openshift-docs/26134

@kcarmichael08 kcarmichael08 changed the title ROX-18976: Update upgrade info ROX-18976: fix language around secured cluster and central version matching Aug 14, 2023
@kcarmichael08 kcarmichael08 force-pushed the ROX-18976-cloud-service-versions branch from 0a4d118 to a7aa5f4 Compare August 17, 2023 19:44
@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 17, 2023
@kcarmichael08 kcarmichael08 force-pushed the ROX-18976-cloud-service-versions branch from a7aa5f4 to 0888dc1 Compare August 17, 2023 19:58
@gaurav-nelson gaurav-nelson added RHACS Label for RHACS related PRs that go in the rhacs-docs branch rhacs-docs-3.74 labels Aug 24, 2023
Copy link

@msugakov msugakov left a comment

Choose a reason for hiding this comment

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

Thanks, this definitely makes an improvement

Comment on lines 34 to 37
[IMPORTANT]
====
If you choose manual updates, you must update the {product-title-short} Operator in all secured clusters when you update the {product-title-short} Operator in the cluster where Central is installed. The secured clusters and the cluster where Central is installed must have the same version to ensure optimal functionality.
If you choose manual updates, you must update the {product-title-short} Operator in all secured clusters when you update the {product-title-short} Operator in the cluster where Central is installed. The secured clusters and the cluster where Central is installed must have the same version to ensure optimal functionality. For {product-title-managed-short}, use the latest version of the software that is available. (The software version for Central is automatically updated.)
====

Choose a reason for hiding this comment

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

This gets rendered on the page dedicated to the installation for self-managed. https://63530--docspreview.netlify.app/openshift-acs/latest/installing/installing_ocp/install-central-ocp#install-acs-operator_install-central-ocp

There's a page about Operator installation for Secured Cluster connected to ACS CS mentioning manual operator updates. https://63530--docspreview.netlify.app/openshift-acs/latest/cloud_service/installing_cloud_ocp/cloud-install-operator#install-acs-operator-cloud_cloud-install-operator
I think, we should add a note there saying that Red Hat recommends enabling automatic upgrades.

I suggest removing the new sentence from this page but adding one as [IMPORTANT] note to the CS page.

Copy link
Contributor Author

@kcarmichael08 kcarmichael08 Sep 27, 2023

Choose a reason for hiding this comment

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

This gets rendered on the page dedicated to the installation for self-managed. 63530--docspreview.netlify.app/openshift-acs/latest/installing/installing_ocp/install-central-ocp#install-acs-operator_install-central-ocp

(disregard previous message - have moved this note to the cloud services operator install module)


The version of {product-title-managed-short} used on Secured Clusters must match the version of the Central instance of {product-title-managed-short} to ensure compatibility.
Customers are responsible for Secured Cluster services upgrades required to maintain this version compatibility.
To ensure optimal functionality and compatibility between Central and secured clusters, upgrade your secured clusters to the latest software version available. (The software version for Central is automatically updated.)

Choose a reason for hiding this comment

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

Optional suggestion:

Suggested change
To ensure optimal functionality and compatibility between Central and secured clusters, upgrade your secured clusters to the latest software version available. (The software version for Central is automatically updated.)
To ensure optimal functionality and compatibility between Central service and Secured Clusters, upgrade your secured clusters to the latest software version available. (The software version for Central is automatically updated.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

secured clusters are not capitalized in the docs.


[role="_abstract"]
Upgrades through the {rh-rhacs-first} Operator are performed automatically or manually, depending on the *Update approval* option you chose at installation.
Upgrades through the {rh-rhacs-first} Operator are performed automatically or manually, depending on the *Update approval* option you chose at installation. Upgrading from version 3.74 to 4.x requires some additional steps that are described on this page. Upgrading within 4.y versions requires no additional steps.

Choose a reason for hiding this comment

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

I suggest stick to 4.x for consistency unless you meant to highlight the difference between 4.x and 4.y in this sentence.

Suggested change
Upgrades through the {rh-rhacs-first} Operator are performed automatically or manually, depending on the *Update approval* option you chose at installation. Upgrading from version 3.74 to 4.x requires some additional steps that are described on this page. Upgrading within 4.y versions requires no additional steps.
Upgrades through the {rh-rhacs-first} Operator are performed automatically or manually, depending on the *Update approval* option you chose at installation. Upgrading from version 3.74 to 4.x requires some additional steps that are described on this page. Upgrading within 4.x versions requires no additional steps.

Comment on lines 36 to 40
include::modules/operator-upgrade-change-subscription-channel.adoc[leveloffset=+3]

include::modules/remove-central-attached-pv-overview.adoc[leveloffset=+1]
include::modules/remove-central-attached-pv-overview.adoc[leveloffset=+3]

include::modules/remove-central-attached-pv-operator.adoc[leveloffset=+2]
include::modules/remove-central-attached-pv-operator.adoc[leveloffset=+4]
Copy link

@msugakov msugakov Aug 29, 2023

Choose a reason for hiding this comment

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

Changing subscription channel is the upgrade itself, therefore it should go one level up to show up in ToC.
Removing central-attached PV is post-upgrade step and should also go one level up.

include::modules/operator-upgrade-change-subscription-channel.adoc[leveloffset=+2]

include::modules/remove-central-attached-pv-overview.adoc[leveloffset=+2]

include::modules/remove-central-attached-pv-operator.adoc[leveloffset=+3]

@msugakov msugakov mentioned this pull request Aug 29, 2023
1 task
Comment on lines +38 to +40
include::modules/remove-central-attached-pv-overview.adoc[leveloffset=+3]

include::modules/remove-central-attached-pv-operator.adoc[leveloffset=+2]
include::modules/remove-central-attached-pv-operator.adoc[leveloffset=+4]

Choose a reason for hiding this comment

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

I noticed the PR description says

  • cherry pick to rhacs-docs-4.0

This will be wrong w.r.t. Remove Central-attached PV section because it only applies to 4.1+ releases.
Continuing our earlier conversation #63482 (comment) (and the one in JIRA), I suggest to structure this page in a following manner:

# Upgrading from 4.0

## Remove Central-attached PV

# Upgrading from 3.x

(notes about upgrading 3.x to 3.74, then from 3.74 to 4.0, then from 4.0 further)

## (upgrade steps)
### Preparing to upgrade
### Changing subscription channel

## Rolling back an Operator upgrade
## Troubleshooting Operator upgrade issues

I.e. group steps corresponding to the release from which the user will upgrade.
Also, optionally, make newer "from" releases go before older ones so that users who upgrade often don't need to scroll the page to check if there are any instructions that apply to their case.

I don't know if we can avoid maintaining separate versions of this page per releases. Cherry-picking shouldn't be used, but at least the new content will be additive.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, based on this and looking into it more, I am going to need to make separate PRs for the branches. I'll be closing this one and opening new ones.

@kcarmichael08
Copy link
Contributor Author

Replaced by #635388

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

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. RHACS Label for RHACS related PRs that go in the rhacs-docs branch size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants