Skip to content

Commit 9aad1e0

Browse files
authored
Merge pull request #41549 from sagidlow/sagidlow-update-FIX-TYPO
Fixing typos for EUS-to-EUS update content
2 parents 12506fd + f4ebf9a commit 9aad1e0

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

_topic_maps/_topic_map.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ Topics:
436436
File: installing-update-service
437437
- Name: Understanding upgrade channels
438438
File: understanding-upgrade-channels-release
439-
- Name: Preparing to perform an EUS to EUS upgrade
439+
- Name: Preparing to perform an EUS-to-EUS update
440440
File: preparing-eus-eus-upgrade
441441
- Name: Updating a cluster within a minor version using the web console
442442
File: updating-cluster-within-minor

modules/updating-eus-to-eus-upgrade.adoc

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@
44

55
:_content-type: PROCEDURE
66
[id="updating-eus-to-eus-upgrade_{context}"]
7-
= EUS to EUS upgrade
7+
= EUS-to-EUS update
88

9-
The following procedure pauses all non-master MachineConfigPools and performs upgrades from {product-title} 4.8 to 4.9 to 4.10, then unpauses the previously paused MachineConfigPools.
10-
Following this procedure reduces the total upgrade duration and the number of times worker nodes are restarted.
9+
The following procedure pauses all non-master MachineConfigPools and performs updates from {product-title} 4.8 to 4.9 to 4.10, then unpauses the previously paused MachineConfigPools.
10+
Following this procedure reduces the total update duration and the number of times worker nodes are restarted.
1111

1212
.Prerequisites
1313

1414
* Review the release notes for {product-title} 4.9 and 4.10
15-
* Review the release notes and product lifecycles for any layered products and OLM Operators. Some may require updates either before or during an EUS to EUS upgrade.
16-
* Ensure that you are familiar with version-specific prerequisites, such as link:https://docs.openshift.com/container-platform/4.9/updating/updating-cluster-prepare.html#update-preparing-migrate_updating-cluster-prepare[administrator acknowledgement] that is required prior to upgrading from {product-title} 4.8 to 4.9.
15+
* Review the release notes and product lifecycles for any layered products and OLM Operators. Some may require updates either before or during an EUS-to-EUS update.
16+
* Ensure that you are familiar with version-specific prerequisites, such as link:https://docs.openshift.com/container-platform/4.9/updating/updating-cluster-prepare.html#update-preparing-migrate_updating-cluster-prepare[administrator acknowledgement] that is required prior to updating from {product-title} 4.8 to 4.9.
1717
* Verify that your cluster is not running a version earlier than {product-title} 4.8.14.
18-
If your cluster is running a version than {product-title} 4.8.14, you must upgrade to a later 4.8.z version prior to upgrading to 4.9.
19-
The upgrade to 4.8.14 or later is necessary to fulfill the minimum version requirements that must be performed without pausing MachineConfigPools.
18+
If your cluster is running a version than {product-title} 4.8.14, you must update to a later 4.8.z version prior to updating to 4.9.
19+
The update to 4.8.14 or later is necessary to fulfill the minimum version requirements that must be performed without pausing MachineConfigPools.
2020
* Verify that MachineConfigPools is unpaused.
2121
2222
.Procedure
2323

24-
. Upgrade any OLM Operators to versions that are compatible with both versions you are upgrading to.
24+
. Upgrade any OLM Operators to versions that are compatible with both versions you are updating to.
2525

2626
. Verify that all MachineConfigPools display a status of `UPDATED` and no MachineConfigPools display a status of `UPDATING`.
2727
To view the status of all MachineConfigPools, run the following command:
@@ -54,7 +54,7 @@ You cannot pause the master pool.
5454
$ oc patch mcp/worker --type merge --patch '{"spec":{"paused":true}}'
5555
----
5656

57-
. To change to the `eus-4.10` channel and upgrade to 4.9, run the following commands:
57+
. To change to the `eus-4.10` channel and update to 4.9, run the following commands:
5858
+
5959
[source,terminal]
6060
----
@@ -69,7 +69,7 @@ $ oc adm upgrade --to-latest
6969
Updating to latest version 4.9.18
7070
----
7171

72-
. To ensure the 4.9 upgrades are completed successfully retrieve the cluster version, run the following command:
72+
. To ensure the 4.9 updates are completed successfully retrieve the cluster version, run the following command:
7373
+
7474
[source,terminal]
7575
----
@@ -84,16 +84,16 @@ NAME VERSION AVAILABLE PROGRESSING SINCE STATUS
8484
version 4.9.18 True False 6m29s Cluster version is 4.9.18
8585
----
8686

87-
. If necessary, upgrade OLM operators using the Administrator perspective on the web console.
87+
. If necessary, upgrade OLM Operators using the Administrator perspective on the web console.
8888

89-
. To upgrade to 4.10, run the following command:
89+
. To update to 4.10, run the following command:
9090
+
9191
[source,terminal]
9292
----
9393
$ oc adm upgrade --to-latest
9494
----
9595

96-
. To ensure the 4.10 upgrade is completed successfully retrieve the cluster version, run the following command:
96+
. To ensure the 4.10 update is completed successfully retrieve the cluster version, run the following command:
9797
+
9898
[source,terminal]
9999
----
@@ -117,10 +117,10 @@ $ oc patch mcp/worker --type merge --patch '{"spec":{"paused":false}}'
117117
+
118118
[NOTE]
119119
====
120-
If pools are not unpaused, the cluster is not permitted to upgrade to any future minors and maintenance tasks such as certificate rotation are inhibited. This puts the cluster at risk for future degradation.
120+
If pools are not unpaused, the cluster is not permitted to update to any future minors and maintenance tasks such as certificate rotation are inhibited. This puts the cluster at risk for future degradation.
121121
====
122122

123-
. To verify that your previously paused pools have updated and your cluster completed the upgrade to 4.10, run the following command:
123+
. To verify that your previously paused pools have updated and your cluster completed the update to 4.10, run the following command:
124124
+
125125
[source,terminal]
126126
----
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
:_content-type: ASSEMBLY
22
[id="preparing-eus-eus-upgrade"]
3-
= Preparing to perform an EUS to EUS upgrade
3+
= Preparing to perform an EUS-to-EUS update
44
include::modules/common-attributes.adoc[]
55
:context: eus-to-eus-upgrade
66

77
toc::[]
88

9-
Due to fundamental Kubernetes design, all {product-title} upgrades between minor versions must be serialized.
10-
You must upgrade from {product-title} 4.8 to 4.9 and then to 4.10. You cannot upgrade from {product-title} 4.8 to 4.10 directly.
11-
However, beginning with the upgrade from {product-title} 4.8 to 4.9 to 4.10, administrators who wish to upgrade between two Extended Update Support (EUS) versions can do so incurring only a single reboot of non-master hosts.
9+
Due to fundamental Kubernetes design, all {product-title} updates between minor versions must be serialized.
10+
You must update from {product-title} 4.8 to 4.9 and then to 4.10. You cannot update from {product-title} 4.8 to 4.10 directly.
11+
However, beginning with the update from {product-title} 4.8 to 4.9 to 4.10, administrators who wish to update between two Extended Update Support (EUS) versions can do so incurring only a single reboot of non-master hosts.
1212

13-
There are a number of caveats to consider when attempting an EUS to EUS upgrade.
13+
There are a number of caveats to consider when attempting an EUS-to-EUS update.
1414

15-
* EUS to EUS upgrades are only offered after upgrades between all versions involved have been made available in `stable` channels.
16-
* If you encounter issues during or after upgrading to the odd-numbered minor version but before upgrading to the next even-numbered version, then remediation of those issues may require that non-master hosts complete the upgrade to the odd-numbered version before moving forward.
17-
* You can complete the upgrade process during multiple maintenance windows by pausing at intermediate steps. However, plan to complete the entire upgrade within 60 days. This is critical to ensure that normal cluster automation processes are completed including those associated with certificate rotation.
18-
* You must be running at least {product-title} 4.8.14 before starting the EUS-to-EUS upgrade procedure. If you do not meet this minimum requirement, upgrade to a later 4.8.z before attempting the EUS-to-EUS upgrade.
19-
* Support for RHEL7 workers was removed in {product-title} 4.10 and replaced with RHEL8 workers, therefore EUS to EUS upgrades are not available for clusters with RHEL7 workers.
20-
* Node components are not updated to {product-title} 4.9. Do not expect all features and bugs fixed in {product-title} 4.9 to be made available until you complete the upgrade to {product-title} 4.10 and enable all MachineConfigPools to update.
15+
* EUS-to-EUS updates are only offered after updates between all versions involved have been made available in `stable` channels.
16+
* If you encounter issues during or after upgrading to the odd-numbered minor version but before upgrading to the next even-numbered version, then remediation of those issues may require that non-master hosts complete the update to the odd-numbered version before moving forward.
17+
* You can complete the update process during multiple maintenance windows by pausing at intermediate steps. However, plan to complete the entire update within 60 days. This is critical to ensure that normal cluster automation processes are completed including those associated with certificate rotation.
18+
* You must be running at least {product-title} 4.8.14 before starting the EUS-to-EUS update procedure. If you do not meet this minimum requirement, update to a later 4.8.z before attempting the EUS-to-EUS update.
19+
* Support for RHEL7 workers was removed in {product-title} 4.10 and replaced with RHEL8 workers, therefore EUS-to-EUS updates are not available for clusters with RHEL7 workers.
20+
* Node components are not updated to {product-title} 4.9. Do not expect all features and bugs fixed in {product-title} 4.9 to be made available until you complete the update to {product-title} 4.10 and enable all MachineConfigPools to update.
2121
2222
2323
include::modules/updating-eus-to-eus-upgrade.adoc[leveloffset=+1]

0 commit comments

Comments
 (0)