Merge pull request #29459 from mburke5678/okd-issue-503

Page not found following "Learn more about OpenShift update channels"

Author: mburke5678

modules/understanding-upgrade-channels.adoc

@@ -19,13 +19,23 @@ administrators explicitly decide to upgrade to the next minor version of
 {product-title}. Upgrade channels control only release selection and do not impact the version of the cluster that you install; the `openshift-install`
 binary file for a specific version of {product-title} always installs that version.
 
+ifndef::openshift-origin[]
 {product-title} {product-version} offers the following upgrade channels:
 
 * `candidate-{product-version}`
 * `fast-{product-version}`
 * `stable-{product-version}`
 * `eus-4.6` (only available when running 4.6)
 
+endif::openshift-origin[]
+ifdef::openshift-origin[]
+{product-title} {product-version} offers the following upgrade channel:
+
+* `stable-4`
+
+endif::openshift-origin[]
+
+ifndef::openshift-origin[]
 [discrete]
 == candidate-{product-version} channel
 
@@ -71,18 +81,30 @@ never appear in the `stable-{product-version}` channel before they appear in the
 
 You can use the `fast-{product-version}` channel to upgrade from a previous minor version of
 {product-title}.
+endif::openshift-origin[]
 
+ifndef::openshift-origin[]
 [discrete]
 == stable-{product-version} channel
-
 While the `fast-{product-version}` channel contains releases as soon
 as their errata are published, releases are added to the `stable-{product-version}` channel
 after a delay. During this delay, data is collected from Red Hat SRE teams, Red Hat support services,
 and pre-production and production environments that participate in connected customer program about the stability of the release.
 
 You can use the `stable-{product-version}` channel to upgrade from a previous minor version of
 {product-title}.
+endif::openshift-origin[]
+ifdef::openshift-origin[]
+[discrete]
+== stable-4 channel
+Releases are added to the `stable-4` channel
+after passing all tests.
+
+You can use the `stable-4` channel to upgrade from a previous minor version of
+{product-title}.
+endif::openshift-origin[]
 
+ifndef::openshift-origin[]
 [discrete]
 == eus-4.6 channel
 
@@ -106,14 +128,21 @@ a supported version of {product-title} 4.6.
 
 Finally, if you install of a 4.6 version that is exclusive to EUS, you will
 similarly not be able to upgrade to a later minor version until upgrades are provided to 4.10.
+endif::openshift-origin[]
 
 [discrete]
 == Upgrade version paths
 
 {product-title} maintains an upgrade recommendation service that understands the
 version of {product-title} you have installed as well as the path to take within
-the channel you choose to get you to the next release. You can imagine seeing the
-following in the `fast-{product-version}` channel:
+the channel you choose to get you to the next release. 
+
+ifndef::openshift-origin[]
+You can imagine seeing the following in the `fast-{product-version}` channel:
+endif::openshift-origin[]
+ifdef::openshift-origin[]
+You can imagine seeing the following in the `stable-4` channel:
+endif::openshift-origin[]
 
 * {product-version}.0
 * {product-version}.1
@@ -124,6 +153,7 @@ The service recommends only upgrades that have been tested and have no serious i
 If your cluster is on {product-version}.1 and {product-title} suggests
 {product-version}.4, then it is safe for you to update from {product-version}.1 to {product-version}.4. Do not rely on consecutive patch numbers. In this example, {product-version}.2 is not, and never was, available in the channel. The update service will not suggest updating to a version of {product-title} that contains known vulnerabilities.
 
+ifndef::openshift-origin[]
 Update stability depends on your channel. The presence of an update recommendation in
 the `candidate-{product-version}` channel does not imply that the update is supported.
 It means that no serious issues have been found with the update yet, but there might
@@ -138,7 +168,17 @@ Red Hat will eventually provide supported update paths from any supported releas
 or `stable-{product-version}` channels to the latest release in {product-version}.z,
 although there can be delays while safe paths away from troubled releases are
 constructed and verified.
+endif::openshift-origin[]
 
+ifdef::openshift-origin[]
+The presence of an update recommendation in the `stable-4`
+channel is a declaration that the update is fully supported while it is in the
+channel. While releases will never be removed from the channel, update recommendations
+that exhibit serious issues will be removed from the channel. Updates initiated
+after the update recommendation has been removed might not be supported.
+endif::openshift-origin[]
+
+ifndef::openshift-origin[]
 [discrete]
 == Fast and stable channel use and strategies
 
@@ -155,6 +195,7 @@ and participating in Red Hat’s connected customer program. Red
 Hat uses this program to observe the impact of updates on your specific hardware and software
 configurations. Future releases might improve or alter the pace at which updates move
 from the `fast-{product-version}` to the `stable-{product-version}` channel.
+endif::openshift-origin[]
 
 [discrete]
 == Restricted network clusters
@@ -163,6 +204,7 @@ If you manage the container images for your {product-title} clusters yourself, y
 During upgrade, the user interface might warn you about switching between these versions,
 so you must ensure that you selected an appropriate version before you bypass those warnings.
 
+ifndef::openshift-origin[]
 [discrete]
 == Switching between channels
 
@@ -177,3 +219,4 @@ be a delay of up to a day for the release to be promoted to
 `stable-{product-version}`. If you change to a channel that does not include your
 current release, an alert displays and no updates can be recommended, but you can
 safely change back to your original channel at any point.
+endif::openshift-origin[]

modules/update-upgrading-web.adoc

@@ -37,12 +37,17 @@ endif::within[]
 ifdef::between[]
 your current minor version,
 endif::between[]
+ifndef::openshift-origin[]
 such as `stable-{product-version}`.
 +
 [IMPORTANT]
 ====
 For production clusters, you must subscribe to a stable-* or fast-* channel.
 ====
+endif::openshift-origin[]
+ifdef::openshift-origin[]
+such as `stable-4`.
+endif::openshift-origin[]
 ** If the *Update Status* is not *Updates Available*, you cannot upgrade your cluster.
 ** *Select Channel* indicates the cluster version that your cluster is running or is updating to.
 
@@ -61,7 +66,12 @@ ifdef::between[]
 +
 --
 ** If updates are available, continue to perform updates in the current channel until you can no longer update.
+ifndef::openshift-origin[]
 ** 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.
+endif::openshift-origin[]
+ifdef::openshift-origin[]
+** If no updates are available, change the *Channel* to the stable-* channel for the next minor version, and update to the version that you want in that channel.
+endif::openshift-origin[]
 --
 +
 You might need to perform several intermediate updates until you reach the version that you want.