Skip to content

Commit 54e7e81

Browse files
authored
Merge pull request #75739 from mletalie/OSDOCS-10074
[OSDOCS-10074]:Expose cluster delete protection feature (ROSA and OSD UI)
2 parents 81939da + b3e071a commit 54e7e81

5 files changed

+30
-10
lines changed

modules/osd-create-cluster-ccs.adoc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ endif::osd-on-gcp[]
134134

135135
. On the *Cluster details* page, provide a name for your cluster and specify the cluster details:
136136
.. Add a *Cluster name*.
137-
.. 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.
137+
.. 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.
138138
+
139-
To customize the subdomain, select the *Create customize 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.
139+
To customize the subdomain, select the *Create customize 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.
140140
.. Select a cluster version from the *Version* drop-down menu.
141141
.. Select a cloud provider region from the *Region* drop-down menu.
142142
.. Select a *Single zone* or *Multi-zone* configuration.
@@ -354,6 +354,10 @@ In the event of critical security concerns that significantly impact the securit
354354

355355
. Review the summary of your selections and click *Create cluster* to start the cluster installation. The installation takes approximately 30-40 minutes to complete.
356356
+
357+
. Optional: On the *Overview* tab, you can enable the delete protection feature by selecting *Enable*, which is located directly under *Delete Protection: Disabled*. This will prevent your cluster from being deleted. To disable delete protection, select *Disable*.
358+
By default, clusters are created with the delete protection feature disabled.
359+
+
360+
357361
ifdef::osd-on-gcp[]
358362
[NOTE]
359363
====

modules/osd-create-cluster-gcp-account.adoc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ For more information about service account keys, click the information icon loca
3131
.. Click *Next* to validate your cloud provider account and go to the *Cluster details* page.
3232
. On the *Cluster details* page, provide a name for your cluster and specify the cluster details:
3333
.. Add a *Cluster name*.
34-
.. 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.
34+
.. 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 as a 15-character string.
3535
+
36-
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.
36+
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.
3737
.. Select a cluster version from the *Version* drop-down menu.
3838
.. Select a cloud provider region from the *Region* drop-down menu.
3939
.. Select a *Single zone* or *Multi-zone* configuration.
@@ -178,6 +178,10 @@ In the event of critical security concerns that significantly impact the securit
178178
====
179179

180180
. Review the summary of your selections and click *Create cluster* to start the cluster installation. The installation takes approximately 30-40 minutes to complete.
181+
+
182+
. Optional: On the *Overview* tab, you can enable the delete protection feature by selecting *Enable*, which is located directly under *Delete Protection: Disabled*. This will prevent your cluster from being deleted. To disable delete protection, select *Disable*.
183+
By default, clusters are created with the delete protection feature disabled.
184+
+
181185

182186
.Verification
183187

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ and click *Next*.
5858

5959
. On the *Cluster details* page, provide a name for your cluster and specify the cluster details:
6060
.. Add a *Cluster name*.
61-
.. 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.
61+
.. 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 as a 15-character string.
6262
+
63-
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.
63+
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.
6464
.. Select a cluster version from the *Version* drop-down menu.
6565
.. Select a cloud provider region from the *Region* drop-down menu.
6666
.. Select a *Single zone* or *Multi-zone* configuration.
@@ -131,6 +131,10 @@ In the event of critical security concerns that significantly impact the securit
131131
====
132132

133133
. Review the summary of your selections and click *Create cluster* to start the cluster installation. The installation takes approximately 30-40 minutes to complete.
134+
+
135+
. Optional: On the *Overview* tab, you can enable the delete protection feature by selecting *Enable*, which is located directly under *Delete Protection: Disabled*. This will prevent your cluster from being deleted. To disable delete protection, select *Disable*.
136+
By default, clusters are created with the delete protection feature disabled.
137+
+
134138

135139
.Verification
136140

modules/osd-create-cluster-rhm-gcp-account.adoc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ For more information about service account keys, click the information icon loca
3131
.. Click *Next* to validate your cloud provider account and go to the *Cluster details* page.
3232
. On the *Cluster details* page, provide a name for your cluster and specify the cluster details:
3333
.. Add a *Cluster name*.
34-
.. 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.
34+
.. 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 as a 15-character string.
3535
+
36-
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.
36+
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.
3737
.. Select a cluster version from the *Version* drop-down menu.
3838
.. Select a cloud provider region from the *Region* drop-down menu.
3939
.. Select a *Single zone* or *Multi-zone* configuration.
@@ -177,6 +177,10 @@ In the event of critical security concerns that significantly impact the securit
177177
====
178178

179179
. Review the summary of your selections and click *Create cluster* to start the cluster installation. The installation takes approximately 30-40 minutes to complete.
180+
+
181+
. Optional: On the *Overview* tab, you can enable the delete protection feature by selecting *Enable*, which is located directly under *Delete Protection: Disabled*. This will prevent your cluster from being deleted. To disable delete protection, select *Disable*.
182+
By default, clusters are created with the delete protection feature disabled.
183+
+
180184

181185
.Verification
182186

modules/rosa-sts-creating-a-cluster-using-defaults-ocm.adoc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
:_mod-docs-content-type: PROCEDURE
77
[id="rosa-sts-creating-a-cluster-using-defaults-ocm_{context}"]
8-
= Creating a cluster with the default options using {cluster-manager}
8+
= Creating a cluster with the default options using {cluster-manager}
99

1010
ifeval::["{context}" == "rosa-sts-creating-a-cluster-quickly"]
1111
:quick-install:
@@ -47,11 +47,15 @@ If your AWS account ID is not listed, check that you have successfully associate
4747
+
4848
====
4949
[NOTE]
50-
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.
50+
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 as 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.
5151
====
5252
. To deploy a cluster quickly, leave the default options in the *Cluster settings*, *Networking*, *Cluster roles and policies*, and *Cluster updates* pages and click *Next* on each page.
5353

5454
. On the *Review your ROSA cluster* page, review the summary of your selections and click *Create cluster* to start the installation.
55+
+
56+
. Optional: On the *Overview* tab, you can enable the delete protection feature by selecting *Enable*, which is located directly under *Delete Protection: Disabled*. This will prevent your cluster from being deleted. To disable delete protection, select *Disable*.
57+
By default, clusters are created with the delete protection feature disabled.
58+
+
5559

5660
.Verification
5761

0 commit comments

Comments
 (0)