Skip to content

Commit 64f1669

Browse files
authored
Merge pull request #74729 from mletalie/OSDOCS-10170.1
[OSDOCS-10170]:Remove obsolete information about upgrading ROSA cluster sections
2 parents 0002700 + 0e572d0 commit 64f1669

File tree

4 files changed

+7
-17
lines changed

4 files changed

+7
-17
lines changed

_topic_maps/_topic_map_rosa.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -680,9 +680,6 @@ Name: Upgrading
680680
Dir: upgrading
681681
Distros: openshift-rosa
682682
Topics:
683-
- Name: Preparing to upgrade ROSA to 4.9
684-
File: rosa-upgrading-cluster-prepare
685-
Distros: openshift-rosa
686683
- Name: Upgrading ROSA with STS
687684
File: rosa-upgrading-sts
688685
- Name: Upgrading ROSA
@@ -1907,6 +1904,10 @@ Topics:
19071904
File: virt-backing-up-vms
19081905
- Name: Restoring virtual machines
19091906
File: virt-restoring-vms
1910-
# - Name: Collecting OKD Virtualization data for community report
1911-
# File: virt-collecting-virt-data
1912-
# Distros: openshift-origin
1907+
# - Name: Removed topics (Placeholder for topics removed from topic map)
1908+
# Dir: Removed_topics
1909+
# Topics:
1910+
# - Name: Collecting OKD Virtualization data for community report
1911+
# File: virt-collecting-virt-data
1912+
# - Name: Preparing to upgrade ROSA to 4.9
1913+
# File: rosa-upgrading-cluster-prepare

modules/rosa-upgrading-automatic-ocm.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ You can schedule recurring, automatic upgrades for z-stream patch versions for y
1818
. Select a preferred day of the week and start time for the upgrade, when updates are available.
1919
. Provide an administrator’s acknowledgment and click *Approve and continue*. {cluster-manager} does not start scheduled y-stream updates for minor versions without receiving an administrator’s acknowledgment.
2020
+
21-
For information about administrator acknowledgment, see xref:./../upgrading/rosa-upgrading-cluster-prepare.adoc#upgrade-49-acknowledgement_rosa-updating-cluster-prepare[Administrator acknowledgment when upgrading to OpenShift 4.9].
2221
. In the *Node draining* pane, select a grace period interval from the list. The grace period enables the nodes to gracefully drain before forcing the pod eviction. The default is *1 hour*.
2322
. In the *Update strategy* pane, click *Save* to apply your update strategy.
2423
+

modules/rosa-upgrading-cli-tutorial.adoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ This method schedules the cluster for an immediate upgrade, if a more recent ver
2626
.Prerequisites
2727

2828
* You have installed and configured the latest ROSA CLI on your installation host.
29-
ifdef::sts[]
30-
* If you are upgrading your cluster from 4.7 to 4.8, you have upgraded the AWS Identity and Access Management (IAM) account-wide roles and policies to version 4.8. You have also updated the `cloudcredential.openshift.io/upgradeable-to` annotation in the `CloudCredential` custom resource.
31-
endif::sts[]
3229
3330
.Procedure
3431

modules/rosa-upgrading-manual-ocm.adoc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@ that uses the AWS Security Token Service (STS)
1717
endif::sts[]
1818
manually one time by using {cluster-manager} console.
1919

20-
ifdef::sts[]
21-
.Prerequisites
22-
23-
* If you are upgrading your cluster from 4.7 to 4.8, you have upgraded the AWS Identity and Access Management (IAM) account-wide roles and policies to version 4.8. You have also updated the `cloudcredential.openshift.io/upgradeable-to` annotation in the `CloudCredential` custom resource. For more information, see _Preparing an upgrade from 4.7 to 4.8_.
24-
endif::sts[]
25-
2620
.Procedure
2721

2822
. Log in to {cluster-manager-url}.
@@ -32,7 +26,6 @@ endif::sts[]
3226
. Select the version you want to upgrade your cluster to. Recommended cluster upgrades appear in the UI.
3327
. If you select an update version that requires approval, provide an administrator’s acknowledgment and click *Approve and continue*.
3428
+
35-
For information about administrator acknowledgment, see xref:./../upgrading/rosa-upgrading-cluster-prepare.adoc#upgrade-49-acknowledgement_rosa-updating-cluster-prepare[Administrator acknowledgment when upgrading to OpenShift 4.9].
3629
. In the *Node draining* pane, select a grace period interval from the list. The grace period enables the nodes to gracefully drain before forcing the pod eviction. The default is *1 hour*.
3730
+
3831
[NOTE]

0 commit comments

Comments
 (0)