From 82b2ee371f1e700feac74fa8f5c6d6f97df70dc2 Mon Sep 17 00:00:00 2001 From: mletalie Date: Wed, 24 Apr 2024 16:45:49 -0400 Subject: [PATCH] update upgrade menu items --- _topic_maps/_topic_map_rosa.yml | 10 +++++----- modules/rosa-upgrading-cli-tutorial.adoc | 9 +-------- modules/rosa-upgrading-manual-ocm.adoc | 10 +--------- rosa_getting_started/rosa-getting-started.adoc | 4 ++-- rosa_getting_started/rosa-quickstart-guide-ui.adoc | 4 ++-- upgrading/rosa-hcp-upgrading.adoc | 2 +- upgrading/rosa-upgrading-sts.adoc | 8 ++++---- upgrading/rosa-upgrading.adoc | 2 +- 8 files changed, 17 insertions(+), 32 deletions(-) diff --git a/_topic_maps/_topic_map_rosa.yml b/_topic_maps/_topic_map_rosa.yml index de187dfcb7..f088b4197f 100644 --- a/_topic_maps/_topic_map_rosa.yml +++ b/_topic_maps/_topic_map_rosa.yml @@ -682,12 +682,10 @@ Name: Upgrading Dir: upgrading Distros: openshift-rosa Topics: -- Name: Upgrading ROSA with STS - File: rosa-upgrading-sts -- Name: Upgrading ROSA - File: rosa-upgrading -- Name: Upgrading ROSA with HCP +- Name: Upgrading ROSA with HCP clusters File: rosa-hcp-upgrading +- Name: Upgrading ROSA Classic clusters + File: rosa-upgrading-sts --- Name: CI/CD Dir: cicd @@ -1926,3 +1924,5 @@ Topics: # File: virt-collecting-virt-data # - Name: Preparing to upgrade ROSA to 4.9 # File: rosa-upgrading-cluster-prepare +# - Name: Upgrading ROSA Classic clusters +# File: rosa-upgrading diff --git a/modules/rosa-upgrading-cli-tutorial.adoc b/modules/rosa-upgrading-cli-tutorial.adoc index 04f5e408d7..8c0359472f 100644 --- a/modules/rosa-upgrading-cli-tutorial.adoc +++ b/modules/rosa-upgrading-cli-tutorial.adoc @@ -15,11 +15,7 @@ endif::[] [id="rosa-upgrading-cli_{context}"] = Upgrading with the ROSA CLI -You can upgrade a {product-title} (ROSA) cluster -ifdef::sts[] -that uses the AWS Security Token Service (STS) -endif::sts[] -manually by using the ROSA CLI (`rosa`). +You can upgrade a {product-title} (ROSA) cluster manually by using the ROSA CLI (`rosa`). This method schedules the cluster for an immediate upgrade, if a more recent version is available. @@ -65,9 +61,6 @@ endif::rosa-hcp[] The cluster is scheduled for an immediate upgrade. This action can take an hour or longer, depending on your workload configuration, such as pod disruption budgets. + You will receive an email when the upgrade is complete. You can also check the status by running the `rosa describe cluster` command again from the ROSA CLI or view the status in {cluster-manager} console. -ifeval::["{context}" == "rosa-upgrading-sts"] -:!sts: -endif::[] .Troubleshooting * Sometimes a scheduled upgrade does not trigger. See link:https://access.redhat.com/solutions/6648291[Upgrade maintenance cancelled] for more information. \ No newline at end of file diff --git a/modules/rosa-upgrading-manual-ocm.adoc b/modules/rosa-upgrading-manual-ocm.adoc index d71771edbf..1facd17560 100644 --- a/modules/rosa-upgrading-manual-ocm.adoc +++ b/modules/rosa-upgrading-manual-ocm.adoc @@ -11,11 +11,7 @@ endif::[] [id="rosa-upgrade-ocm_{context}"] = Scheduling individual upgrades through the {cluster-manager} console -You can schedule upgrades for a {product-title} cluster -ifdef::sts[] -that uses the AWS Security Token Service (STS) -endif::sts[] -manually one time by using {cluster-manager} console. +You can schedule upgrades for a {product-title} cluster manually one time by using {cluster-manager} console. .Procedure @@ -53,9 +49,5 @@ The cluster is scheduled for an upgrade to the target version. This action can t + The status is displayed in the *Update status* pane. -ifeval::["{context}" == "rosa-upgrading-sts"] -:!sts: -endif::[] - .Troubleshooting * Sometimes a scheduled upgrade does not trigger. See link:https://access.redhat.com/solutions/6648291[Upgrade maintenance cancelled] for more information. \ No newline at end of file diff --git a/rosa_getting_started/rosa-getting-started.adoc b/rosa_getting_started/rosa-getting-started.adoc index 40f0826bc8..d080c704b3 100644 --- a/rosa_getting_started/rosa-getting-started.adoc +++ b/rosa_getting_started/rosa-getting-started.adoc @@ -88,6 +88,6 @@ include::modules/rosa-getting-started-deleting-a-cluster.adoc[leveloffset=+1] * For more information about setting up accounts and ROSA clusters using AWS STS, see xref:../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-sts-overview-of-the-deployment-workflow[Understanding the ROSA with STS deployment workflow] -* For information about setting up accounts and ROSA clusters without using AWS STS, see xref:../rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-getting-started-workflow.adoc#rosa-understanding-the-deployment-workflow[Understanding the ROSA deployment workflow] +* For more information about setting up accounts and ROSA clusters without using AWS STS, see xref:../rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-getting-started-workflow.adoc#rosa-understanding-the-deployment-workflow[Understanding the ROSA deployment workflow] -* For documentation on upgrading your cluster, see xref:../upgrading/rosa-upgrading.adoc#rosa-upgrading[Upgrading ROSA clusters] +* For more information about upgrading your cluster, see xref:../upgrading/rosa-upgrading-sts.adoc#rosa-upgrading-sts[Upgrading ROSA Classic clusters] diff --git a/rosa_getting_started/rosa-quickstart-guide-ui.adoc b/rosa_getting_started/rosa-quickstart-guide-ui.adoc index c291409b74..33fdbd8dd0 100644 --- a/rosa_getting_started/rosa-quickstart-guide-ui.adoc +++ b/rosa_getting_started/rosa-quickstart-guide-ui.adoc @@ -163,6 +163,6 @@ include::modules/rosa-getting-started-deleting-a-cluster.adoc[leveloffset=+1] * For more information about setting up accounts and ROSA clusters using AWS STS, see xref:../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-sts-overview-of-the-deployment-workflow[Understanding the ROSA with STS deployment workflow]. -* For information about setting up accounts and ROSA clusters without using AWS STS, see xref:../rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-getting-started-workflow.adoc#rosa-understanding-the-deployment-workflow[Understanding the ROSA deployment workflow]. +* For more information about setting up accounts and ROSA clusters without using AWS STS, see xref:../rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-getting-started-workflow.adoc#rosa-understanding-the-deployment-workflow[Understanding the ROSA deployment workflow]. -* For documentation on upgrading your cluster, see xref:../upgrading/rosa-upgrading.adoc#rosa-upgrading[Upgrading ROSA clusters]. +* For more information about upgrading your cluster, see xref:../upgrading/rosa-upgrading-sts.adoc#rosa-upgrading-sts[Upgrading ROSA Classic clusters]. diff --git a/upgrading/rosa-hcp-upgrading.adoc b/upgrading/rosa-hcp-upgrading.adoc index 50a5579731..b0e4b1c278 100644 --- a/upgrading/rosa-hcp-upgrading.adoc +++ b/upgrading/rosa-hcp-upgrading.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY [id="rosa-hcp-upgrading"] -= Upgrading {hcp-title} += Upgrading {hcp-title} clusters include::_attributes/attributes-openshift-dedicated.adoc[] :context: rosa-hcp-upgrading diff --git a/upgrading/rosa-upgrading-sts.adoc b/upgrading/rosa-upgrading-sts.adoc index 4d1cbc3ff5..f31edd0843 100644 --- a/upgrading/rosa-upgrading-sts.adoc +++ b/upgrading/rosa-upgrading-sts.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY [id="rosa-upgrading-sts"] -= Upgrading ROSA clusters with STS += Upgrading ROSA Classic clusters include::_attributes/attributes-openshift-dedicated.adoc[] :context: rosa-upgrading-sts @@ -14,16 +14,16 @@ To plan an upgrade, review the xref:../rosa_architecture/rosa_policy_service_def Upgrades are manually initiated or automatically scheduled. Red Hat Site Reliability Engineers (SREs) monitor upgrade progress and remedy any issues encountered. [id="rosa-sts-upgrading-a-cluster-with-sts"] -== Upgrading a ROSA cluster that uses STS +== Upgrading a ROSA Classic cluster -There are two methods to upgrade {product-title} (ROSA) clusters that uses the AWS Security Token Service (STS): +There are two methods to upgrade Classic {product-title} (ROSA) clusters: * Individual upgrades through the ROSA CLI (`rosa`) * Individual upgrades through the {cluster-manager} console [NOTE] ==== -For steps to upgrade a ROSA cluster that does not use the AWS Security Token Service (STS), see xref:../upgrading/rosa-upgrading.adoc#rosa-upgrading[Upgrading ROSA clusters]. +When you follow a scheduled upgrade policy, a delay of an hour or more before the upgrade process begins might occur, even if the upgrade is configured to begin immediately. Additionally, the duration of the upgrade might vary based on your workload configuration. ==== include::modules/rosa-upgrading-cli-tutorial.adoc[leveloffset=+2] diff --git a/upgrading/rosa-upgrading.adoc b/upgrading/rosa-upgrading.adoc index f0bedd29c1..4b8f34d076 100644 --- a/upgrading/rosa-upgrading.adoc +++ b/upgrading/rosa-upgrading.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY [id="rosa-upgrading"] -= Upgrading ROSA clusters += Upgrading ROSA Classic clusters include::_attributes/attributes-openshift-dedicated.adoc[] :context: rosa-upgrading