[enterprise-4.3] other available 4.2 update changes

_topic_map.yml

@@ -171,9 +171,11 @@ Name: Updating clusters
 Dir: updating
 Distros: openshift-origin,openshift-enterprise
 Topics:
-- Name: Updating a cluster to a minor version from the web console
+- Name: Updating a cluster between minor versions
+  File: updating-cluster-between-minor
+- Name: Updating a cluster within a minor version from the web console
   File: updating-cluster
-- Name: Updating a cluster to a minor version by using the CLI
+- Name: Updating a cluster within a minor version by using the CLI
   File: updating-cluster-cli
 - Name: Updating a cluster that includes RHEL compute machines
   File: updating-cluster-rhel-compute

modules/understanding-upgrade-channels.adoc

@@ -1,11 +1,12 @@
 // Module included in the following assemblies:
 //
-// updating/updating-cluster.adoc
-// updating/updating-cluster-cli.adoc
-// updating/updating-cluster-rhel-compute.adoc
-// updating/updating-disconnected-cluster.adoc
+// * updating/updating-cluster.adoc
+// * updating/updating-cluster-between-minor.adoc
+// * updating/updating-cluster-cli.adoc
+// * updating/updating-cluster-rhel-compute.adoc
+// * updating/updating-disconnected-cluster.adoc
 
-[id="understanding_upgrade_channels_{context}"]
+[id="understanding-upgrade-channels_{context}"]
 = Understanding {product-title} upgrade channels
 
 In {product-title} 4.1, Red Hat introduced the concept of upgrade channels for
@@ -19,6 +20,4 @@ have no impact on the version of the cluster you install; the
 `openshift-install` binary for a given patch level of {product-title} always
 installs that patch level.
 
-See link:https://access.redhat.com/articles/4495171[OpenShift 4.2 Upgrades
-phased roll out] for more information on the types of updates and upgrade
-channels.
+See link:https://access.redhat.com/articles/4495171[OpenShift 4.2 Upgrades phased roll out] for more information on the types of updates and upgrade channels.

modules/update-service-overview.adoc

@@ -33,6 +33,11 @@ architectures as well as other component packages. After the pipeline confirms
 the suitability of a release, the {product-title} update service notifies you
 that it is available.
 
+[IMPORTANT]
+====
+Because the update service displays all valid updates, you must not force an update to a version that the update service does not display.
+====
+
 ////
 The interaction between the registry and the {product-title} update service is different during
 bootstrap and continuous update modes. When you bootstrap the initial

modules/update-upgrading-cli.adoc

@@ -46,7 +46,7 @@ $ oc get clusterversion -o json|jq ".items[0].spec"
 +
 [IMPORTANT]
 ====
-For production clusters, you must subscribe to the `stable-4.2` channel.
+For production clusters, you must subscribe to a `stable-*` channel.
 ====
 
 . View the available updates and note the version number of the update that

modules/update-upgrading-web.adoc

@@ -1,14 +1,22 @@
 // Module included in the following assemblies:
 //
 // * updating/updating-cluster.adoc
+// * updating/updating-cluster-between-minor.adoc
+
+ifeval::["{context}" == "updating-cluster"]
+:within:
+endif::[]
+ifeval::["{context}" == "updating-cluster-between-minor"]
+:between:
+endif::[]
 
 [id="update-upgrading-web_{context}"]
 = Updating a cluster by using the web console
 
 If updates are available, you can update your cluster from the web console.
 
 You can find information about available {product-title} advisories and updates
-link:https://access.redhat.com/downloads/content/290/ver=4.1/rhel---7/4.1.0/x86_64/product-errata[in the errata section]
+link:https://access.redhat.com/downloads/content/290/ver=4.2/rhel---7/4.2.0/x86_64/product-errata[in the errata section]
 of the Customer Portal.
 
 .Prerequisites
@@ -19,17 +27,42 @@ of the Customer Portal.
 
 . From the web console, click *Administration* > *Cluster Settings* and review
 the contents of the *Overview* tab.
-.. For production clusters, ensure that the *CHANNEL* is set to `stable-4.2`.
+. For production clusters, ensure that the *CHANNEL* is set to the correct channel for
+ifdef::within[]
+the version that you want to update to,
+endif::within[]
+ifdef::between[]
+your current minor version,
+endif::between[]
+such as `stable-{product-version}`.
 +
 [IMPORTANT]
 ====
-For production clusters, you must subscribe to the `stable-4.2` channel.
+For production clusters, you must subscribe to a stable-* or fast-* channel.
 ====
-.. If the *UPDATE STATUS* is not *Updates Available*, you cannot upgrade your
+** If the *UPDATE STATUS* is not *Updates Available*, you cannot upgrade your
 cluster.
-.. The *DESIRED VERSION* indicates the cluster version that your cluster is running
+** The *DESIRED VERSION* indicates the cluster version that your cluster is running
 or is updating to.
 
-. Click *Updates Available*, select a version to update to, and click *Update*.
+. Click *Updates Available*, select
+ifdef::within[]
+a version to update to,
+endif::within[]
+ifdef::between[]
+the highest available version
+endif::between[]
+and click *Update*.
 The *UPDATE STATUS* changes to `Updating`, and you can review the progress of
 the Operator upgrades on the *Cluster Operators* tab.
+
+ifdef::between[]
+. After the update completes and the Cluster Version Operator refreshes the available updates, check if more updates are available in your current channel.
++
+--
+** If updates are available, continue to perform updates in the current channel until you can no longer update.
+** If no updates are available, change the *CHANNEL* to the stable-* or fast-* channel for the next minor version, and update to the version that you want in that channel.
+--
++
+You might need to perform several intermediate updates until you reach the version that you want.
+endif::between[]

updating/updating-cluster-between-minor.adoc

@@ -0,0 +1,24 @@
+[id="updating-cluster-between-minor"]
+= Updating a cluster between minor versions
+include::modules/common-attributes.adoc[]
+:context: updating-cluster-between-minor
+
+toc::[]
+
+You can update, or upgrade, an {product-title} cluster between minor versions.
+
+[NOTE]
+====
+Because of the difficulty of changing update channels by using `oc`, use the web console to change the update channel. It is recommended to complete the update process within the web console. You can follow the steps in xref:../updating/updating-cluster-cli.adoc#updating-cluster-cli[Updating a cluster within a minor version by using the CLI] to complete the update after you change to a {product-version} channel.
+====
+
+.Prerequisites
+
+* Access to the cluster as a user with `admin` privileges.
+See xref:../authentication/using-rbac.adoc[Using RBAC to define and apply permissions].
+
+include::modules/update-service-overview.adoc[leveloffset=+1]
+
+include::modules/understanding-upgrade-channels.adoc[leveloffset=+1]
+
+include::modules/update-upgrading-web.adoc[leveloffset=+1]

updating/updating-cluster-cli.adoc

@@ -1,12 +1,11 @@
 [id="updating-cluster-cli"]
-= Updating a cluster to a minor version by using the CLI
+= Updating a cluster within a minor version by using the CLI
 include::modules/common-attributes.adoc[]
 :context: updating-cluster-cli
 
 toc::[]
 
-You can update, or upgrade, an {product-title} cluster by using the
-OpenShift CLI (`oc`).
+You can update, or upgrade, an {product-title} cluster within a minor version by using the OpenShift CLI (`oc`).
 
 include::modules/update-service-overview.adoc[leveloffset=+1]
 

updating/updating-cluster.adoc

@@ -1,12 +1,11 @@
 [id="updating-cluster"]
-= Updating a cluster to a minor version from the web console
+= Updating a cluster within a minor version from the web console
 include::modules/common-attributes.adoc[]
 :context: updating-cluster
 
 toc::[]
 
-You can update, or upgrade, an {product-title} cluster to a minor version by
-using the web console.
+You can update, or upgrade, an {product-title} cluster by using the web console.
 
 .Prerequisites