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

JIRA-OSDOCS3322: Updated the steps for cluster upgrades per the UI changes #44907

Merged
merged 1 commit into from
Jun 21, 2022

Conversation

sayjadha
Copy link
Contributor

@sayjadha sayjadha commented Apr 23, 2022

This PR is to address the JIRA issue: https://issues.redhat.com/browse/OSDOCS-3322

Following is the change:
Per the latest UI changes, made the following updates to the cluster upgrade content:

  • Changed 'manual upgrades' to 'individual upgrades' in conceptual info. and procedures for both OSD and ROSA docs.
  • Changed 'automatic upgrades' to 'recurring upgrades' in conceptual info. and procedures for both OSD and ROSA docs.
    Wireframe: https://marvelapp.com/prototype/hdh8ai1/screen/84703875

The change is seen in the following topics:
OSD topics:

ROSA topics:

Repo: Request cherrypick to enterprise-4.10 and enterprise-4.11

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 23, 2022
@netlify
Copy link

netlify bot commented Apr 23, 2022

Deploy Preview for osdocs ready!

Name Link
🔨 Latest commit 3d7ac7dac0ab9ee549a245ceec0240a10f4bba34
🔍 Latest deploy log https://app.netlify.com/sites/osdocs/deploys/6281d816368afd000873f1d4
😎 Deploy Preview https://deploy-preview-44907--osdocs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@sayjadha sayjadha force-pushed the JIRA-OSDOCS3322 branch from 7c00561 to e03d55f Compare May 9, 2022 02:20
@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 9, 2022
@sayjadha sayjadha force-pushed the JIRA-OSDOCS3322 branch 2 times, most recently from c587557 to 6778d1c Compare May 9, 2022 16:33
Copy link
Contributor

@wgordon17 wgordon17 left a comment

Choose a reason for hiding this comment

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

Added additional context that admin requirement is only for y-stream versions, while the z-stream versions continue to happen automatically

modules/osd-create-cluster-ccs.adoc Outdated Show resolved Hide resolved
modules/osd-create-cluster-red-hat-account.adoc Outdated Show resolved Hide resolved
modules/rosa-upgrading-automatic-ocm.adoc Outdated Show resolved Hide resolved
modules/upgrade-auto.adoc Outdated Show resolved Hide resolved
modules/upgrade-auto.adoc Outdated Show resolved Hide resolved
modules/upgrade.adoc Outdated Show resolved Hide resolved
Copy link
Contributor

@arendej arendej left a comment

Choose a reason for hiding this comment

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

Reviewed the ROSA pages.

@@ -105,6 +105,11 @@ If the cluster privacy is set to *Private*, you cannot access your cluster until
You can review the end-of-life dates in the update life cycle documentation for {product-title}. For more information, see _{product-title} update life cycle_.
====
+
.. Provide administrator approval per your cluster update method:
** Individual updates: If you select an update version that requires approval, provide an administrator’s acknowledgment and click *Approve and continue*.
** Recurring updates: If you selected recurring updates for your cluster, provide an administrator’s acknowledgment and click *Approve and continue*. The {cluster-manager} does not start scheduled updates without receiving an administrator's acknowledgment.

Choose a reason for hiding this comment

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

y-stream upgrade is controlled by another attribute enable_minor_version_upgrades set to true which is not supported on UI yet.

modules/upgrade.adoc Outdated Show resolved Hide resolved
Copy link
Contributor

@EricPonvelle EricPonvelle left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 10, 2022
@xueli181114
Copy link

/lgtm

Copy link

@Tessg22 Tessg22 left a comment

Choose a reason for hiding this comment

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

Suggested small text corrections.

modules/rosa-upgrading-manual-ocm.adoc Show resolved Hide resolved
modules/upgrade-manual.adoc Outdated Show resolved Hide resolved
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 12, 2022
@openshift-ci
Copy link

openshift-ci bot commented May 12, 2022

New changes are detected. LGTM label has been removed.

@sayjadha
Copy link
Contributor Author

@wgordon17 , @xueli181114 : I incorporated your feedback. Could you please review the doc updates and let me know if you have any additional comments? Thank you.

Copy link
Contributor

@wgordon17 wgordon17 left a comment

Choose a reason for hiding this comment

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

LGTM

@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 25, 2022
@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 25, 2022
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 25, 2022
@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 25, 2022
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 1, 2022
@lpettyjo lpettyjo added the peer-review-needed Signifies that the peer review team needs to review this PR label Jun 17, 2022
@lpettyjo lpettyjo self-requested a review June 17, 2022 12:37
Copy link
Contributor

@lpettyjo lpettyjo left a comment

Choose a reason for hiding this comment

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

Otherwise, LGTM!

@@ -28,7 +28,11 @@ endif::sts[]
. Log in to {cluster-manager-url}.
. Select a cluster to upgrade.
. Click the *Settings* tab.
. In the *Update strategy* pane, click *Manual* or *Individual Updates*.
. In the *Update strategy* pane, select *Individual Updates*.
. Select the version you want to upgrade your cluster to. Recommended cluster upgrades are notated in the UI.
Copy link
Contributor

Choose a reason for hiding this comment

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

Recommend changing to "Recommended cluster upgrades appear in the UI." for simpler language.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Made the change.

. Click *Update* in the *Update Status* box.

. Select the version you want to upgrade your cluster to. Recommended cluster upgrades will be notated in the UI. To learn more about each available upgrade version, click *View release notes*.
. Select the version you want to upgrade your cluster to. Recommended cluster upgrades are notated in the UI. To learn more about each available upgrade version, click *View release notes*.
Copy link
Contributor

Choose a reason for hiding this comment

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

Same comment as above.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Incorporated the feedback.


If you opt for manual upgrades, you are responsible for updating your cluster. If your cluster version falls too far behind, it will transition to a limited support status. For more information on OpenShift life cycle policies, see xref:../osd_policy/osd-life-cycle.adoc#osd-life-cycle[{product-title} update life cycle].
If you opt for manual upgrades, you are responsible for updating your cluster. If your cluster version falls too far behind, it will transition to a limited support status. For more information on OpenShift life cycle policies, see xref:../osd_architecture/osd_policy/osd-life-cycle.adoc#osd-life-cycle[{product-title} update life cycle].
Copy link
Contributor

Choose a reason for hiding this comment

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

Change "fall too far behind" to "becomes outdated"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Made the change.

@lpettyjo lpettyjo added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Jun 17, 2022
@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 21, 2022
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 21, 2022
@maxwelldb maxwelldb merged commit 614fbc9 into openshift:main Jun 21, 2022
@maxwelldb
Copy link
Contributor

/cherry-pick enterprise-4.10

@maxwelldb
Copy link
Contributor

/cherry-pick enterprise-4.11

@openshift-cherrypick-robot

@maxwelldb: new pull request created: #46906

In response to this:

/cherry-pick enterprise-4.10

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-cherrypick-robot

@maxwelldb: new pull request created: #46907

In response to this:

/cherry-pick enterprise-4.11

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
Labels
branch/enterprise-4.10 branch/enterprise-4.11 peer-review-done Signifies that the peer review team has reviewed this PR 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.

10 participants