Merge pull request #99305 from mletalie/OSDOCS-16193

[OSDOCS-16193]Revised ROSA Life Cycle (Extension)

Author: mletalie

modules/create-wif-cluster-cli.adoc

@@ -52,6 +52,7 @@ $ ocm gcp create wif-config --name <wif_name> \ <1>
 <2> Replace `<gcp_project_id>` with the ID of the {GCP} project where the WIF configuration will be implemented.
 <3> Optional: Replace `<osd_version>` with the desired {product-title} version the wif-config will need to support. If you do not specify a version, the wif-config will support the latest {product-title} y-stream version as well as the last three supported {product-title} y-stream versions (beginning with version 4.17).
 <4> Optional: Replace `<gcp_project_id>` with the ID of the dedicated project where the workload identity pools and providers will be created and managed. If the `--federated-project` flag is not specified, the workload identity pools and providers will be created and managed in the project specified by the `--project` flag.
+
 +
 
 [NOTE]
@@ -199,6 +200,7 @@ $ ocm create cluster <cluster_name> \ <1>
 --min-replicas=3 \ <11>
 --max-replicas=6 \ <12>
 --secure-boot-for-shielded-vms=true <13>
+--channel-group <channel_group_name> <14>
 ----
 <1> Replace `<cluster_name>` with a name for your cluster.
 <2> Set value to `gcp`.
@@ -213,6 +215,8 @@ $ ocm create cluster <cluster_name> \ <1>
 <11> Optional: Minimum number of compute nodes.
 <12> Optional: Maximum number of compute nodes.
 <13> Optional: Secure Boot enables the use of Shielded VMs in the Google Cloud Platform.
+<14> Optional: Replace `<channel_group_name>` with the name of the channel group you want to assign the cluster to. Channel group options include `stable` and `eus`.
+
 
 [IMPORTANT]
 ====

modules/create-wif-cluster-ocm.adoc

@@ -63,6 +63,14 @@ To customize the subdomain prefix, select the *Create custom domain prefix* chec
 Workload Identity Federation (WIF) is only supported on {product-title} version 4.17 and later.
 ====
 +
+// This is commented out as UI is not yet ready for this feature. Will be added at a later date. Assignee can copy and paste in a new PR.
+// .. Select a channel group from the *Channel group* drop-down menu.
+// +
+// [NOTE]
+// ====
+// Channel group options include "Stable" (default option) and "EUS". For more information about the Stable and EUS channel group options, see link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/updating_clusters/understanding-openshift-updates-1#understanding-update-channels-releases[Understanding update channels and releases].
+// ====
+// +
 .. Select a cloud provider region from the *Region* drop-down menu.
 .. Select a *Single zone* or *Multi-zone* configuration.
 +

modules/life-cycle-dates.adoc

@@ -9,15 +9,30 @@
 
 [options="header"]
 |===
-|Version    |General availability   |End of life
-|4.20       |Oct 21, 2025           |Feb 21, 2027
-|4.19       |Jun 16, 2025           |Oct 21, 2026
-|4.18       |Feb 26, 2025           |Jun 21, 2026
-|4.17       |Oct 14, 2024           |Feb 14, 2026
-|4.16^[1]^  |Jul 2, 2024            |Dec 27, 2025
-|4.15       |Feb 27, 2024           |Aug 27, 2025
+|Version    |General availability   |Maintenance support ends  |Extended Update Support Add-On - Term 1 ends
+|4.20       |Oct 21, 2025           |Apr 21, 2027              |Oct 21, 2027
+|4.19       |Jun 17, 2025           |Dec 17, 2026              |
+|4.18       |Feb 25, 2025           |Aug 25, 2026              |Feb 25, 2027
+|4.17       |Oct 1, 2024            |Apr 1, 2026               |
+|4.16       |Jun 27, 2024           |Dec 27, 2025              |Jun 27, 2026
+|4.15       |Feb 27, 2024           |Aug 27, 2025              |
 |===
 
-1. Extended Update Support (EUS) Term 1 is coming soon for {product-title} customers on even-numbered versions, starting with version 4.16. This extended support will be included with your subscription and be available before the standard support period for version 4.16 ends. For more information about EUS Term 1, see link:https://access.redhat.com/support/policy/updates/openshift#eus[Extended Update Support Add-On - Term 1].
+The Extended Update Support Add-On - Term 1 is now available for {product-title} customers using even-numbered versions, starting with 4.16, and is included at no additional cost with your {product-title} subscription.
 
+The Extended Update Support Add-On - Term 1 provides the key benefit of extending the support lifecycle for an eligible minor release from 18 months to a total of 24 months. This 6-month extension allows organizations to maintain stability for mission-critical applications, meet complex regulatory validation schedules, and manage limited maintenance windows by providing continued access to critical and important security updates and urgent-priority bug fixes without requiring a full version upgrade.
 
+To apply Extended Update Support Add-On - Term 1 to your {product-title} cluster, you must update the channel group to `EUS`.
+ifdef::openshift-rosa-hcp,openshift-rosa[]
+For more information about updating your cluster channel group, see _edit cluster_ in the _Additional resources_ section.
+endif::openshift-rosa-hcp,openshift-rosa[]
+For more information about Extended Update Support Add-On - Term 1, see link:https://access.redhat.com/support/policy/updates/openshift#eus[Extended Update Support Add-On].
+
+//Conditionalizing the admonition below as the ability to have separate version control for CPs and MPs are a feature of ROSA w/HCP only
+ifdef::openshift-rosa-hcp[]
+[IMPORTANT]
+=====
+Before upgrading your cluster from version 4.16 to version 4.18, confirm that your control plane and machines pools are using version 4.16.
+See _Upgrade options for {product-title} clusters_ in the _Additional resources_ section for more information.
+=====
+endif::openshift-rosa-hcp[]

modules/osd-create-cluster-ccs.adoc

@@ -53,8 +53,15 @@ To customize the subdomain, select the *Create customize domain prefix* checkbox
 ====
 Clusters configured with Private Service Connect (PSC) are only supported on OpenShift Dedicated version 4.17 and later. For more information regarding PSC, see _Private Service Overview_ in the _Additional resources_ section.
 ====
-
-
+// This is commented out as UI is not yet ready for this feature. Will be added at a later date. Assignee can copy and paste in a new PR.
+// +
+// .. Select a channel group from the *Channel group* drop-down menu.
+// +
+// [NOTE]
+// ====
+// Channel group options include "Stable" (default option) and "EUS". For more information about the Stable and EUS channel group options, see link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/updating_clusters/understanding-openshift-updates-1#understanding-update-channels-releases[Understanding update channels and releases].
+// ====
++
 .. Select a cloud provider region from the *Region* drop-down menu.
 .. Select a *Single zone* or *Multi-zone* configuration.
 +

modules/osd-create-cluster-red-hat-account.adoc

@@ -34,6 +34,15 @@ You must have the required resource quota for the *Annual* subscription type to
 +
 To customize the subdomain, select the *Create custom domain prefix* checkbox, and enter your domain prefix name in the *Domain prefix* field. The domain prefix cannot be longer than 15 characters, must be unique within your organization, and cannot be changed after cluster creation.
 .. Select a cluster version from the *Version* drop-down menu.
+//This is commented out as UI is not yet ready for this feature. Will be added at a later date. Assignee can copy and paste in a new PR.
+// +
+// .. Select a channel group from the *Channel group* drop-down menu.
+// +
+// [NOTE]
+// ====
+// Channel group options include "Stable" (default option) and "EUS". For more information about the Stable and EUS channel group options, see link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/updating_clusters/understanding-openshift-updates-1#understanding-update-channels-releases[Understanding update channels and releases].
+// ====
++
 .. Select a cloud provider region from the *Region* drop-down menu.
 .. Select a *Single zone* or *Multi-zone* configuration.
 .. Select a *Persistent storage* capacity for the cluster. For more information, see the _Storage_ section in the {product-title} service definition.

modules/rosa-create-objects.adoc

@@ -355,6 +355,10 @@ Tags that are added by Red{nbsp}Hat are required for clusters to stay in complia
 
 |--worker-iam-role string
 |The ARN of the IAM role that will be attached to compute instances.
+
+|--channel-group <channel_group_name>
+|Allows users to assign their cluster to a specific channel group. Options include `stable` and `eus`. For more information about channel groups, see link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/updating_clusters/understanding-openshift-updates-1#understanding-update-channels-releases[Understanding update channels and releases].
+
 |===
 
 .Optional arguments inherited from parent commands

modules/rosa-edit-objects.adoc

@@ -44,6 +44,8 @@ ifdef::openshift-rosa-hcp[]
 |Specifies the account used for billing subscriptions purchased from the AWS marketplace.
 endif::openshift-rosa-hcp[]
 
+|--channel-group <channel_group_name>
+|Allows users to assign their cluster to a specific channel group. Options include `stable` and `eus`. For more information about channel groups, see link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/updating_clusters/understanding-openshift-updates-1#understanding-update-channels-releases[Understanding update channels and releases].
 |===
 
 .Optional arguments inherited from parent commands

modules/rosa-release-notes-Q4-2025.adoc

@@ -19,4 +19,13 @@ ifdef::openshift-rosa-hcp[]
 ** Thailand (`ap-southeast-7`)
 +
 For more information on region availabilities, see link:https://docs.redhat.com/en/documentation/red_hat_openshift_service_on_aws/4/html-single/introduction_to_rosa/index#rosa-sdpolicy-regions-az_rosa-hcp-service-definition[Regions and availability zones].
-endif::openshift-rosa-hcp[]
+endif::openshift-rosa-hcp[]
+
+* **Extended Update Support (EUS) channel group now available.**
+You can now select the EUS channel group when creating or editing your {product-title} cluster. The EUS channel group allows you to extend the life cycle of your even-numbered version {product-title} cluster, giving you additional time to plan and budget for future upgrades as well as providing continued security patches and critical bug fixes. For additional information, see
+ifdef::openshift-rosa-hcp[]
+ link:https://docs.redhat.com/en/documentation/red_hat_openshift_service_on_aws/4/html/introduction_to_rosa/policies-and-service-definition#sd-life-cycle-dates_rosa-hcp-life-cycle[Life cycle dates].
+endif::openshift-rosa-hcp[]
+ifdef::openshift-rosa[]
+link:https://docs.redhat.com/en/documentation/red_hat_openshift_service_on_aws_classic_architecture/4/html/introduction_to_rosa/policies-and-service-definition#sd-life-cycle-dates_rosa-life-cycle[Life cycle dates].
+endif::openshift-rosa[]

osd_whats_new/osd-whats-new.adoc

@@ -15,7 +15,12 @@ With its foundation in Kubernetes, {product-title} is a complete {OCP} cluster p
 [id="osd-new-changes-and-updates_{context}"]
 == New changes and updates
 
-include::modules/rosa-release-notes-Q4-2025.adoc[leveloffset=+1]
+[id="osd-q4-2025_{context}"]
+//Commenting out of OSD docs until it is determined how OCM CLI will be presented in docs and/or option is avail in UI.
+// === Q4 2025
+// * **Extended Update Support (EUS) channel group now available.**
+// You can now select the EUS channel group when creating or editing your {product-title} cluster. The EUS channel group allows you to extend the life cycle of your even-numbered version {product-title} cluster, giving you additional time to plan and budget for future upgrades as well as providing continued security patches and critical bug fixes. For additional information, see link:https://docs.redhat.com/en/documentation/openshift_dedicated/4/html/introduction_to_openshift_dedicated/policies-and-service-definition#sd-life-cycle-dates_osd-life-cycle[Life cycle dates].
+
 
 [id="osd-q3-2025_{context}"]
 === Q3 2025

rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc

@@ -30,3 +30,7 @@ include::modules/life-cycle-deletion.adoc[leveloffset=+1]
 
 include::modules/life-cycle-mandatory-upgrades.adoc[leveloffset=+1]
 include::modules/life-cycle-dates.adoc[leveloffset=+1]
+
+.Additional resources
+* xref:../../cli_reference/rosa_cli/rosa-manage-objects-cli.adoc#rosa-edit-cluster_rosa-managing-objects-cli[edit cluster]
+* xref:../../upgrading/rosa-hcp-upgrading.adoc#rosa-upgrade-options_rosa-hcp-upgrading[Upgrade options for {product-title} clusters]