From c1508c7251438b2f0a92b7e45075cc8fdeca4caf Mon Sep 17 00:00:00 2001 From: AedinC Date: Thu, 30 Oct 2025 12:44:22 +0000 Subject: [PATCH] OSDOCS-16538:Life Cycle Extension -UI for OSD and ROSA. --- modules/create-wif-cluster-ocm.adoc | 14 ++++++-------- modules/osd-create-cluster-ccs.adoc | 14 ++++++-------- modules/osd-create-cluster-red-hat-account.adoc | 15 ++++++--------- ...ating-a-cluster-with-customizations-ocm.adoc | 12 +++++++++--- snippets/rosa-osd-channel-group-options.adoc | 17 +++++++++++++++++ 5 files changed, 44 insertions(+), 28 deletions(-) create mode 100644 snippets/rosa-osd-channel-group-options.adoc diff --git a/modules/create-wif-cluster-ocm.adoc b/modules/create-wif-cluster-ocm.adoc index b6bb1625b580..26d27d0a3590 100644 --- a/modules/create-wif-cluster-ocm.adoc +++ b/modules/create-wif-cluster-ocm.adoc @@ -63,14 +63,12 @@ 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 channel group from the *Channel group* drop-down menu. ++ +-- +include::snippets/rosa-osd-channel-group-options.adoc[] +-- ++ .. Select a cloud provider region from the *Region* drop-down menu. .. Select a *Single zone* or *Multi-zone* configuration. + diff --git a/modules/osd-create-cluster-ccs.adoc b/modules/osd-create-cluster-ccs.adoc index 23ca04b3adbc..2302a3ff692f 100644 --- a/modules/osd-create-cluster-ccs.adoc +++ b/modules/osd-create-cluster-ccs.adoc @@ -53,14 +53,12 @@ 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 channel group from the *Channel group* drop-down menu. ++ +-- +include::snippets/rosa-osd-channel-group-options.adoc[] +-- + .. Select a cloud provider region from the *Region* drop-down menu. .. Select a *Single zone* or *Multi-zone* configuration. diff --git a/modules/osd-create-cluster-red-hat-account.adoc b/modules/osd-create-cluster-red-hat-account.adoc index 6e73e9d37816..b900072f8f14 100644 --- a/modules/osd-create-cluster-red-hat-account.adoc +++ b/modules/osd-create-cluster-red-hat-account.adoc @@ -34,14 +34,11 @@ 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 channel group from the *Channel group* drop-down menu. ++ +-- +include::snippets/rosa-osd-channel-group-options.adoc[] +-- + .. Select a cloud provider region from the *Region* drop-down menu. .. Select a *Single zone* or *Multi-zone* configuration. @@ -136,4 +133,4 @@ By default, clusters are created with the delete protection feature disabled. [IMPORTANT] ==== If your cluster deployment fails during installation, certain resources created during the installation process are not automatically removed from your {GCP} account. To remove these resources from your {gcp-short} account, you must delete the failed cluster. -==== \ No newline at end of file +==== diff --git a/modules/rosa-sts-creating-a-cluster-with-customizations-ocm.adoc b/modules/rosa-sts-creating-a-cluster-with-customizations-ocm.adoc index e396d946853a..dbba04d6e10a 100644 --- a/modules/rosa-sts-creating-a-cluster-with-customizations-ocm.adoc +++ b/modules/rosa-sts-creating-a-cluster-with-customizations-ocm.adoc @@ -6,7 +6,7 @@ [id="rosa-sts-creating-cluster-customizations-ocm_{context}"] = Creating a cluster with customizations by using {cluster-manager} -When you create a {product-title} (ROSA) cluster that uses the AWS Security Token Service (STS), you can customize your installation interactively by using {cluster-manager-first}. +When you create a {product-title} cluster that uses the AWS Security Token Service (STS), you can customize your installation interactively by using {cluster-manager-first}. [IMPORTANT] ==== @@ -196,10 +196,16 @@ If the *Accounts and roles* page was refreshed, you might need to select the che . On the *Cluster details* page, provide a name for your cluster and specify the cluster details: .. Add a *Cluster name*. -.. Optional: Cluster creation generates a domain prefix as a subdomain for your provisioned cluster on `openshiftapps.com`. If the cluster name is less than or equal to 15 characters, that name is used for the domain prefix. If the cluster name is longer than 15 characters, the domain prefix is randomly generated to a 15 character string. +.. Optional: Cluster creation generates a domain prefix as a subdomain for your provisioned cluster on `openshiftapps.com`. If the cluster name is less than or equal to 15 characters, that name is used for the domain prefix. If the cluster name is longer than 15 characters, the domain prefix is randomly generated to a 15 character string. + -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. +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. +.. Select a channel group from the *Channel group* drop-down menu. ++ +-- +include::snippets/rosa-osd-channel-group-options.adoc[] +-- ++ .. Select a cloud provider region from the *Region* drop-down menu. .. Select a *Single zone* or *Multi-zone* configuration. .. Leave *Enable user workload monitoring* selected to monitor your own projects in isolation from Red{nbsp}Hat Site Reliability Engineer (SRE) platform metrics. This option is enabled by default. diff --git a/snippets/rosa-osd-channel-group-options.adoc b/snippets/rosa-osd-channel-group-options.adoc new file mode 100644 index 000000000000..33bd2a7a2826 --- /dev/null +++ b/snippets/rosa-osd-channel-group-options.adoc @@ -0,0 +1,17 @@ +// Snippet included in the following assemblies and modules: +// +// * rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-quickly.adoc +// * osd_gcp_clusters/osd-creating-a-gcp-cluster-sa.adoc +// * osd_gcp_clusters/osd-creating-a-gcp-cluster-with-workload-identity-federation.adoc +// * osd_gcp_clusters/osd-creating-a-gcp-cluster-redhat-account.adoc +// * modules/rosa-sts-creating-a-cluster-using-defaults-ocm.adoc +// * modules/create-wif-cluster-ocm.adoc +// * modules/osd-create-ccs.adoc +// * modules/osd-create-cluster-redhat-account.adoc + +:_mod-docs-content-type: SNIPPET + +[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/latest/html/updating_clusters/understanding-openshift-updates-1#understanding-update-channels-releases[Understanding update channels and releases]. +====