Skip to content

Commit 941c68a

Browse files
authored
Merge pull request #74960 from mletalie/OSDOCS-10307
[OSDOCS-10307]:Remove obsolete information from OSD docs about upgrading cluster sections
2 parents 3b2ce89 + 8ad43cc commit 941c68a

6 files changed

+3
-11
lines changed

_topic_maps/_topic_map_osd.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -453,12 +453,8 @@ Name: Upgrading
453453
Dir: upgrading
454454
Distros: openshift-dedicated
455455
Topics:
456-
- Name: Preparing to upgrade OpenShift Dedicated to 4.9
457-
File: osd-upgrading-cluster-prepare
458-
Distros: openshift-dedicated
459456
- Name: Upgrading OpenShift Dedicated
460457
File: osd-upgrades
461-
Distros: openshift-dedicated
462458
---
463459
Name: CI/CD
464460
Dir: cicd

modules/osd-create-cluster-ccs.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ You can review the end-of-life dates in the update lifecycle documentation for {
347347
** Individual updates: If you select an update version that requires approval, provide an administrator’s acknowledgment and click *Approve and continue*.
348348
** Recurring updates: If you selected recurring updates for your cluster, 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.
349349
+
350-
For information about administrator acknowledgment, see xref:./../upgrading/osd-upgrading-cluster-prepare.adoc#upgrade-49-acknowledgement_osd-updating-cluster-prepare[Administrator acknowledgment when upgrading to OpenShift 4.9].
350+
351351
.. If you opted for recurring updates, select a preferred day of the week and upgrade start time in UTC from the drop-down menus.
352352
.. Optional: You can set a grace period for *Node draining* during cluster upgrades. A *1 hour* grace period is set by default.
353353
.. Click *Next*.

modules/osd-create-cluster-gcp-account.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ You can review the end-of-life dates in the update lifecycle documentation for {
168168
** Individual updates: If you select an update version that requires approval, provide an administrator’s acknowledgment and click *Approve and continue*.
169169
** Recurring updates: If you selected recurring updates for your cluster, 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.
170170
+
171-
For information about administrator acknowledgment, see xref:./../upgrading/osd-upgrading-cluster-prepare.adoc#upgrade-49-acknowledgement_osd-updating-cluster-prepare[Administrator acknowledgment when upgrading to OpenShift 4.9].
172171
.. If you opted for recurring updates, select a preferred day of the week and upgrade start time in UTC from the drop-down menus.
173172
.. Optional: You can set a grace period for *Node draining* during cluster upgrades. A *1 hour* grace period is set by default.
174173
.. Click *Next*.

modules/osd-create-cluster-red-hat-account.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ You can review the end-of-life dates in the update lifecycle documentation for {
121121
** Individual updates: If you select an update version that requires approval, provide an administrator’s acknowledgment and click *Approve and continue*.
122122
** Recurring updates: If you selected recurring updates for your cluster, 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.
123123
+
124-
For information about administrator acknowledgment, see xref:./../upgrading/osd-upgrading-cluster-prepare.adoc#upgrade-49-acknowledgement_osd-updating-cluster-prepare[Administrator acknowledgment when upgrading to OpenShift 4.9].
125124
.. If you opted for recurring updates, select a preferred day of the week and upgrade start time in UTC from the drop-down menus.
126125
.. Optional: You can set a grace period for *Node draining* during cluster upgrades. A *1 hour* grace period is set by default.
127126
.. Click *Next*.

modules/osd-create-cluster-rhm-gcp-account.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ You can review the end-of-life dates in the update lifecycle documentation for {
167167
** Individual updates: If you select an update version that requires approval, provide an administrator’s acknowledgment and click *Approve and continue*.
168168
** Recurring updates: If you selected recurring updates for your cluster, 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.
169169
+
170-
For information about administrator acknowledgment, see xref:./../upgrading/osd-upgrading-cluster-prepare.adoc#upgrade-49-acknowledgement_osd-updating-cluster-prepare[Administrator acknowledgment when upgrading to OpenShift 4.9].
171170
.. If you opted for recurring updates, select a preferred day of the week and upgrade start time in UTC from the drop-down menus.
172171
.. Optional: You can set a grace period for *Node draining* during cluster upgrades. A *1 hour* grace period is set by default.
173172
.. Click *Next*.

modules/upgrade.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
[id="upgrade_{context}"]
88
= Understanding {product-title} cluster upgrades
99

10-
1110
When upgrades are made available for your {product-title} cluster, you can upgrade to the newest version through {cluster-manager-first} or {cluster-manager} CLI. You can set your upgrade policies on existing clusters or during cluster creation, and upgrades can be scheduled to occur automatically or manually.
1211

1312
Red Hat Site Reliability Engineers (SRE) will provide a curated list of available versions for your {product-title} clusters. For each cluster you will be able to review the full list of available releases, as well as the corresponding release notes. {cluster-manager} will enable installation of clusters at the latest supported versions, and upgrades can be canceled at any time.
@@ -29,7 +28,7 @@ When following a scheduled upgrade policy, there might be a delay of an hour or
2928

3029
Upgrades can be scheduled to occur automatically on a day and time specified by the cluster owner or administrator. Upgrades occur on a weekly basis, unless an upgrade is unavailable for that week.
3130

32-
If you select recurring updates for your cluster, you must provide an administrator’s acknowledgment. {cluster-manager} does not start scheduled y-stream updates for minor versions without receiving an administrator’s acknowledgment. For information about administrator acknowledgment, see link:https://docs.openshift.com/dedicated/upgrading/osd-upgrading-cluster-prepare.html#upgrade-49-acknowledgement_osd-updating-cluster-prepare[Administrator acknowledgment when upgrading to OpenShift 4.9].
31+
If you select recurring updates for your cluster, you must provide an administrator’s acknowledgment. {cluster-manager} does not start scheduled y-stream updates for minor versions without receiving an administrator’s acknowledgment.
3332

3433
[NOTE]
3534
====
@@ -39,7 +38,7 @@ Recurring upgrade policies are optional and if they are not set, the upgrade pol
3938
[id="upgrade-manual_upgrades_{context}"]
4039
== Individual upgrades
4140

42-
If you opt for individual upgrades, you are responsible for updating your cluster. If you select an update version that requires approval, you must provide an administrator’s acknowledgment. For information about administrator acknowledgment, see xref:./../upgrading/osd-upgrading-cluster-prepare.adoc#upgrade-49-acknowledgement_osd-updating-cluster-prepare[Administrator acknowledgment when upgrading to OpenShift 4.9].
41+
If you opt for individual upgrades, you are responsible for updating your cluster. If you select an update version that requires approval, you must provide an administrator’s acknowledgment.
4342

4443
If your cluster version becomes outdated, 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].
4544

0 commit comments

Comments
 (0)