Merge pull request #54784 from ousleyp/cnv-17781-2

CNV-17781: follow-up PR with fixes

Author: ousleyp

modules/virt-about-eus-updates.adoc

@@ -6,7 +6,14 @@
 [id="virt-about-eus-updates_{context}"]
 = About EUS-to-EUS updates
 
-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.
+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. 
+
+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. 
+
+When the {product-title} update succeeds, the corresponding update for {VirtProductName} becomes available. You can now update {VirtProductName} to the target EUS version.
+
+[id="preparing-to-update_{context}"]
+== Preparing to update
 
 Before beginning an EUS-to-EUS update, you must:
 

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

@@ -16,12 +16,7 @@ When you update from one Extended Update Support (EUS) version to the next, you
 
 * You paused the worker nodes' machine config pools as directed by the {product-title} documentation.
 
-* Your {VirtProductName} subscription uses the *Automatic* approval strategy.
-+
-[NOTE]
-====
-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.
-====
+* 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.
 
 .Procedure
 
@@ -124,14 +119,18 @@ $ oc get clusterversion
 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.
 ====
 
-. 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:
+. Update {VirtProductName}.
+* With the default *Automatic* approval strategy, {VirtProductName} automatically updates to the corresponding version after you update {product-title}. 
+* If you use the *Manual* approval strategy, approve the pending updates by using the web console.
+
+. Monitor the {VirtProductName} update by running the following command:
 +
 [source,terminal]
 ----
 $ oc get csv -n openshift-cnv
 ----
 
-. Continue to monitor as {VirtProductName} updates to the z-stream versions that are available for the non-EUS version.
+. 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.
 
 . Confirm that {VirtProductName} successfully updated to the latest z-stream release of the non-EUS version by running the following command:
 +
@@ -158,14 +157,20 @@ $ oc get hco kubevirt-hyperconverged -n openshift-cnv -o json | jq ".status.vers
 $ oc get hco kubevirt-hyperconverged -n openshift-cnv -o json | jq ".status.conditions"
 ----
 
-. Update to the target EUS version.
-.. Update {product-title} to the target EUS version. Confirm that the update succeeded by checking the cluster version:
+. Update {product-title} to the target EUS version. 
+
+. Confirm that the update succeeded by checking the cluster version:
 +
 [source,terminal]
 ----
 $ oc get clusterversion
 ----
-.. After {product-title} updates, {VirtProductName} automatically updates to the target EUS version. Monitor the update by running the following command:
+
+. Update {VirtProductName} to the target EUS version.
+* With the default *Automatic* approval strategy, {VirtProductName} automatically updates to the corresponding version after you update {product-title}. 
+* If you use the *Manual* approval strategy, approve the pending updates by using the web console.
+
+. Monitor the {VirtProductName} update by running the following command:
 +
 [source,terminal]
 ----