Skip to content

Commit 14a65ca

Browse files
mburke5678mburke5678
authored
Merge pull request #75119 from mletalie/OSDOCS-10299
[OSDOCS-10299]Update/Remove Cluster Upgrade Titles
2 parents 7048faf + 233a466 commit 14a65ca

File tree

8 files changed

+17
-32
lines changed

8 files changed

+17
-32
lines changed

‎_topic_maps/_topic_map_rosa.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -682,12 +682,10 @@ Name: Upgrading
682682
Dir: upgrading
683683
Distros: openshift-rosa
684684
Topics:
685-
- Name: Upgrading ROSA with STS
686-
File: rosa-upgrading-sts
687-
- Name: Upgrading ROSA
688-
File: rosa-upgrading
689-
- Name: Upgrading ROSA with HCP
685+
- Name: Upgrading ROSA with HCP clusters
690686
File: rosa-hcp-upgrading
687+
- Name: Upgrading ROSA Classic clusters
688+
File: rosa-upgrading-sts
691689
---
692690
Name: CI/CD
693691
Dir: cicd
@@ -1926,3 +1924,5 @@ Topics:
19261924
# File: virt-collecting-virt-data
19271925
# - Name: Preparing to upgrade ROSA to 4.9
19281926
# File: rosa-upgrading-cluster-prepare
1927+
# - Name: Upgrading ROSA Classic clusters
1928+
# File: rosa-upgrading

‎modules/rosa-upgrading-cli-tutorial.adoc

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@ endif::[]
1515
[id="rosa-upgrading-cli_{context}"]
1616
= Upgrading with the ROSA CLI
1717

18-
You can upgrade a {product-title} (ROSA) cluster
19-
ifdef::sts[]
20-
that uses the AWS Security Token Service (STS)
21-
endif::sts[]
22-
manually by using the ROSA CLI (`rosa`).
18+
You can upgrade a {product-title} (ROSA) cluster manually by using the ROSA CLI (`rosa`).
2319

2420
This method schedules the cluster for an immediate upgrade, if a more recent version is available.
2521

@@ -65,9 +61,6 @@ endif::rosa-hcp[]
6561
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.
6662
+
6763
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.
68-
ifeval::["{context}" == "rosa-upgrading-sts"]
69-
:!sts:
70-
endif::[]
7164

7265
.Troubleshooting
7366
* Sometimes a scheduled upgrade does not trigger. See link:https://access.redhat.com/solutions/6648291[Upgrade maintenance cancelled] for more information.

‎modules/rosa-upgrading-manual-ocm.adoc

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@ endif::[]
1111
[id="rosa-upgrade-ocm_{context}"]
1212
= Scheduling individual upgrades through the {cluster-manager} console
1313

14-
You can schedule upgrades for a {product-title} cluster
15-
ifdef::sts[]
16-
that uses the AWS Security Token Service (STS)
17-
endif::sts[]
18-
manually one time by using {cluster-manager} console.
14+
You can schedule upgrades for a {product-title} cluster manually one time by using {cluster-manager} console.
1915

2016
.Procedure
2117

@@ -53,9 +49,5 @@ The cluster is scheduled for an upgrade to the target version. This action can t
5349
+
5450
The status is displayed in the *Update status* pane.
5551

56-
ifeval::["{context}" == "rosa-upgrading-sts"]
57-
:!sts:
58-
endif::[]
59-
6052
.Troubleshooting
6153
* Sometimes a scheduled upgrade does not trigger. See link:https://access.redhat.com/solutions/6648291[Upgrade maintenance cancelled] for more information.

‎rosa_getting_started/rosa-getting-started.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,6 @@ include::modules/rosa-getting-started-deleting-a-cluster.adoc[leveloffset=+1]
8888

8989
* 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]
9090

91-
* 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]
91+
* 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]
9292

93-
* For documentation on upgrading your cluster, see xref:../upgrading/rosa-upgrading.adoc#rosa-upgrading[Upgrading ROSA clusters]
93+
* For more information about upgrading your cluster, see xref:../upgrading/rosa-upgrading-sts.adoc#rosa-upgrading-sts[Upgrading ROSA Classic clusters]

‎rosa_getting_started/rosa-quickstart-guide-ui.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,6 @@ include::modules/rosa-getting-started-deleting-a-cluster.adoc[leveloffset=+1]
163163

164164
* 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].
165165

166-
* 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].
166+
* 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].
167167

168-
* For documentation on upgrading your cluster, see xref:../upgrading/rosa-upgrading.adoc#rosa-upgrading[Upgrading ROSA clusters].
168+
* For more information about upgrading your cluster, see xref:../upgrading/rosa-upgrading-sts.adoc#rosa-upgrading-sts[Upgrading ROSA Classic clusters].

‎upgrading/rosa-hcp-upgrading.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="rosa-hcp-upgrading"]
3-
= Upgrading {hcp-title}
3+
= Upgrading {hcp-title} clusters
44
include::_attributes/attributes-openshift-dedicated.adoc[]
55
:context: rosa-hcp-upgrading
66

‎upgrading/rosa-upgrading-sts.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="rosa-upgrading-sts"]
3-
= Upgrading ROSA clusters with STS
3+
= Upgrading ROSA Classic clusters
44
include::_attributes/attributes-openshift-dedicated.adoc[]
55
:context: rosa-upgrading-sts
66

@@ -14,16 +14,16 @@ To plan an upgrade, review the xref:../rosa_architecture/rosa_policy_service_def
1414
Upgrades are manually initiated or automatically scheduled. Red Hat Site Reliability Engineers (SREs) monitor upgrade progress and remedy any issues encountered.
1515

1616
[id="rosa-sts-upgrading-a-cluster-with-sts"]
17-
== Upgrading a ROSA cluster that uses STS
17+
== Upgrading a ROSA Classic cluster
1818

19-
There are two methods to upgrade {product-title} (ROSA) clusters that uses the AWS Security Token Service (STS):
19+
There are two methods to upgrade Classic {product-title} (ROSA) clusters:
2020

2121
* Individual upgrades through the ROSA CLI (`rosa`)
2222
* Individual upgrades through the {cluster-manager} console
2323

2424
[NOTE]
2525
====
26-
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].
26+
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.
2727
====
2828

2929
include::modules/rosa-upgrading-cli-tutorial.adoc[leveloffset=+2]

‎upgrading/rosa-upgrading.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="rosa-upgrading"]
3-
= Upgrading ROSA clusters
3+
= Upgrading ROSA Classic clusters
44
include::_attributes/attributes-openshift-dedicated.adoc[]
55
:context: rosa-upgrading
66

0 commit comments

Comments
 (0)