Skip to content

Commit 291316b

Browse files
committed
CNV-17781: follow-up PR with fixes
1 parent 0ee2eb0 commit 291316b

File tree

2 files changed

+24
-12
lines changed

2 files changed

+24
-12
lines changed

modules/virt-about-eus-updates.adoc

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@
66
[id="virt-about-eus-updates_{context}"]
77
= About EUS-to-EUS updates
88

9-
Every even-numbered minor version of {product-title}, including 4.10 and 4.12, is an Extended Update Support (EUS) version. However, because Kubernetes design mandates serial minor version updates, you cannot directly update from one EUS version to the next. You must first update to the each z-stream release of the odd-numbered minor version before you can proceed to the target EUS version.
9+
Every even-numbered minor version of {product-title}, including 4.10 and 4.12, is an Extended Update Support (EUS) version. However, because Kubernetes design mandates serial minor version updates, you cannot directly update from one EUS version to the next.
10+
11+
After you update from the source EUS version to the next odd-numbered minor version, you must sequentially update {VirtProductName} to all z-stream releases of that minor version that are on your update path. When you have upgraded to the latest applicable z-stream version, you can then update {product-title} to the target EUS minor version.
12+
13+
When the {product-title} update succeeds, the corresponding update for {VirtProductName} becomes available. You can now update {VirtProductName} to the target EUS version.
14+
15+
[id="preparing-to-update_{context}"]
16+
== Preparing to update
1017

1118
Before beginning an EUS-to-EUS update, you must:
1219

modules/virt-preventing-workload-updates-during-eus-update.adoc

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@ When you update from one Extended Update Support (EUS) version to the next, you
1616
1717
* You paused the worker nodes' machine config pools as directed by the {product-title} documentation.
1818
19-
* Your {VirtProductName} subscription uses the *Automatic* approval strategy.
20-
+
21-
[NOTE]
22-
====
23-
If you use the *Manual* approval strategy, you must approve all pending updates in the web console. This is discouraged because your cluster becomes unsupported if your {VirtProductName} and {product-title} versions are out of sync. For more details, refer to the "Manually approving a pending Operator update" section.
24-
====
19+
* It is recommended that you use the default *Automatic* approval strategy. If you use the *Manual* approval strategy, you must approve all pending updates in the web console. For more details, refer to the "Manually approving a pending Operator update" section.
2520
2621
.Procedure
2722

@@ -124,14 +119,18 @@ $ oc get clusterversion
124119
Updating {product-title} to the next version is a prerequisite for updating {VirtProductName}. For more details, refer to the "Updating clusters" section of the {product-title} documentation.
125120
====
126121

127-
. With the default *Automatic* approval strategy, {VirtProductName} automatically updates to the corresponding version after you update {product-title}. Monitor the {VirtProductName} update by running the following command:
122+
. Update {VirtProductName}.
123+
* With the default *Automatic* approval strategy, {VirtProductName} automatically updates to the corresponding version after you update {product-title}.
124+
* If you use the *Manual* approval strategy, approve the pending updates by using the web console.
125+
126+
. Monitor the {VirtProductName} update by running the following command:
128127
+
129128
[source,terminal]
130129
----
131130
$ oc get csv -n openshift-cnv
132131
----
133132

134-
. Continue to monitor as {VirtProductName} updates to the z-stream versions that are available for the non-EUS version.
133+
. Update {VirtProductName} to every z-stream version that is available for the non-EUS minor version, monitoring each update by running the command shown in the previous step.
135134

136135
. Confirm that {VirtProductName} successfully updated to the latest z-stream release of the non-EUS version by running the following command:
137136
+
@@ -158,14 +157,20 @@ $ oc get hco kubevirt-hyperconverged -n openshift-cnv -o json | jq ".status.vers
158157
$ oc get hco kubevirt-hyperconverged -n openshift-cnv -o json | jq ".status.conditions"
159158
----
160159

161-
. Update to the target EUS version.
162-
.. Update {product-title} to the target EUS version. Confirm that the update succeeded by checking the cluster version:
160+
. Update {product-title} to the target EUS version.
161+
162+
. Confirm that the update succeeded by checking the cluster version:
163163
+
164164
[source,terminal]
165165
----
166166
$ oc get clusterversion
167167
----
168-
.. After {product-title} updates, {VirtProductName} automatically updates to the target EUS version. Monitor the update by running the following command:
168+
169+
. Update {VirtProductName} to the target EUS version.
170+
* With the default *Automatic* approval strategy, {VirtProductName} automatically updates to the corresponding version after you update {product-title}.
171+
* If you use the *Manual* approval strategy, approve the pending updates by using the web console.
172+
173+
. Monitor the {VirtProductName} update by running the following command:
169174
+
170175
[source,terminal]
171176
----

0 commit comments

Comments
 (0)