Skip to content

Commit 4321f6b

Browse files
EricPonvelleEricPonvelle
authored
Merge pull request #101435 from AedinC/OSDOCS-16538
OSDOCS-16538:Life Cycle Extension -UI for OSD and ROSA.
2 parents 459d4f1 + c1508c7 commit 4321f6b

File tree

5 files changed

+44
-28
lines changed

5 files changed

+44
-28
lines changed

‎modules/create-wif-cluster-ocm.adoc‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,12 @@ To customize the subdomain prefix, select the *Create custom domain prefix* chec
6363
Workload Identity Federation (WIF) is only supported on {product-title} version 4.17 and later.
6464
====
6565
+
66-
// 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.
67-
// .. Select a channel group from the *Channel group* drop-down menu.
68-
// +
69-
// [NOTE]
70-
// ====
71-
// 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].
72-
// ====
73-
// +
66+
.. Select a channel group from the *Channel group* drop-down menu.
67+
+
68+
--
69+
include::snippets/rosa-osd-channel-group-options.adoc[]
70+
--
71+
+
7472
.. Select a cloud provider region from the *Region* drop-down menu.
7573
.. Select a *Single zone* or *Multi-zone* configuration.
7674
+

‎modules/osd-create-cluster-ccs.adoc‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,12 @@ To customize the subdomain, select the *Create customize domain prefix* checkbox
5353
====
5454
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.
5555
====
56-
// 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.
57-
// +
58-
// .. Select a channel group from the *Channel group* drop-down menu.
59-
// +
60-
// [NOTE]
61-
// ====
62-
// 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].
63-
// ====
56+
+
57+
.. Select a channel group from the *Channel group* drop-down menu.
58+
+
59+
--
60+
include::snippets/rosa-osd-channel-group-options.adoc[]
61+
--
6462
+
6563
.. Select a cloud provider region from the *Region* drop-down menu.
6664
.. Select a *Single zone* or *Multi-zone* configuration.

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,11 @@ You must have the required resource quota for the *Annual* subscription type to
3434
+
3535
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.
3636
.. Select a cluster version from the *Version* drop-down menu.
37-
//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.
38-
// +
39-
// .. Select a channel group from the *Channel group* drop-down menu.
40-
// +
41-
// [NOTE]
42-
// ====
43-
// 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].
44-
// ====
37+
.. Select a channel group from the *Channel group* drop-down menu.
38+
+
39+
--
40+
include::snippets/rosa-osd-channel-group-options.adoc[]
41+
--
4542
+
4643
.. Select a cloud provider region from the *Region* drop-down menu.
4744
.. Select a *Single zone* or *Multi-zone* configuration.
@@ -136,4 +133,4 @@ By default, clusters are created with the delete protection feature disabled.
136133
[IMPORTANT]
137134
====
138135
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.
139-
====
136+
====

‎modules/rosa-sts-creating-a-cluster-with-customizations-ocm.adoc‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="rosa-sts-creating-cluster-customizations-ocm_{context}"]
77
= Creating a cluster with customizations by using {cluster-manager}
88

9-
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}.
9+
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}.
1010

1111
[IMPORTANT]
1212
====
@@ -196,10 +196,16 @@ If the *Accounts and roles* page was refreshed, you might need to select the che
196196

197197
. On the *Cluster details* page, provide a name for your cluster and specify the cluster details:
198198
.. Add a *Cluster name*.
199-
.. 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.
199+
.. 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.
200200
+
201-
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.
201+
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.
202202
.. Select a cluster version from the *Version* drop-down menu.
203+
.. Select a channel group from the *Channel group* drop-down menu.
204+
+
205+
--
206+
include::snippets/rosa-osd-channel-group-options.adoc[]
207+
--
208+
+
203209
.. Select a cloud provider region from the *Region* drop-down menu.
204210
.. Select a *Single zone* or *Multi-zone* configuration.
205211
.. 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.

‎snippets/rosa-osd-channel-group-options.adoc‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Snippet included in the following assemblies and modules:
2+
//
3+
// * rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-quickly.adoc
4+
// * osd_gcp_clusters/osd-creating-a-gcp-cluster-sa.adoc
5+
// * osd_gcp_clusters/osd-creating-a-gcp-cluster-with-workload-identity-federation.adoc
6+
// * osd_gcp_clusters/osd-creating-a-gcp-cluster-redhat-account.adoc
7+
// * modules/rosa-sts-creating-a-cluster-using-defaults-ocm.adoc
8+
// * modules/create-wif-cluster-ocm.adoc
9+
// * modules/osd-create-ccs.adoc
10+
// * modules/osd-create-cluster-redhat-account.adoc
11+
12+
:_mod-docs-content-type: SNIPPET
13+
14+
[NOTE]
15+
====
16+
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].
17+
====

0 commit comments

Comments
 (0)