Skip to content

Commit 35fd02f

Browse files
committed
mp updates
1 parent 2ff522d commit 35fd02f

File tree

7 files changed

+28
-14
lines changed

7 files changed

+28
-14
lines changed

modules/creating-a-machine-pool-ocm.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ifdef::openshift-rosa[]
1414
endif::openshift-rosa[]
1515

1616
ifndef::openshift-rosa[]
17-
A default machine pool is created when you install an {product-title} cluster. After installation, you can create additional machine pools for your cluster by using {cluster-manager}.
17+
A machine pool is created when you install an {product-title} cluster. After installation, you can create additional machine pools for your cluster by using {cluster-manager}.
1818
endif::openshift-rosa[]
1919
ifdef::openshift-rosa[]
2020
You can create additional machine pools for your {product-title} (ROSA) cluster by using {cluster-manager}.
@@ -23,12 +23,12 @@ endif::openshift-rosa[]
2323
ifndef::openshift-rosa[]
2424
[IMPORTANT]
2525
====
26-
The compute (also known as worker) node instance types, autoscaling options, and node counts that are available to you depend on your
26+
The compute (also known as worker) node instance types, autoscaling options, and node counts that are available to you depend on your
2727
ifdef::openshift-rosa[]
28-
ROSA
28+
ROSA
2929
endif::openshift-rosa[]
3030
ifndef::openshift-rosa[]
31-
{product-title}
31+
{product-title}
3232
endif::[]
3333
subscriptions, resource quotas and deployment scenario. For more information, contact your sales representative or Red Hat support.
3434
====

modules/creating-a-machine-pool.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
[id="creating_a_machine_pool_{context}"]
77
= Creating a machine pool
88

9-
A default machine pool is created when you install a {product-title} (ROSA) cluster. After installation, you can create additional machine pools for your cluster by using {cluster-manager} or the ROSA CLI (`rosa`).
9+
A machine pool is created when you install a {product-title} (ROSA) cluster. After installation, you can create additional machine pools for your cluster by using {cluster-manager} or the ROSA CLI (`rosa`).
1010
[NOTE]
1111
====
12-
For users of ROSA CLI `rosa` version 1.2.25 and prior versions, the default machine pool is identified as `Default`. For users of ROSA CLI `rosa` version 1.2.26 and beyond, the default machine pool is identified as `Worker`.
12+
For users of ROSA CLI `rosa` version 1.2.25 and prior versions, the machine pool created along with the cluster is identified as `Default`. For users of ROSA CLI `rosa` version 1.2.26 and beyond, the machine pool created along with the cluster is identified as 'worker'.
1313
====

modules/deleting-machine-pools-ocm.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ endif::openshift-rosa[]
1515

1616
You can delete a machine pool for your Red Hat OpenShift Service on AWS (ROSA) cluster by using OpenShift Cluster Manager.
1717

18+
[NOTE]
19+
====
20+
For users of ROSA CLI `rosa` version 1.2.25 and prior versions, the machine pool (ID='Default') created along with the cluster cannot be deleted. For users of ROSA CLI `rosa` version 1.2.26 and beyond, the machine pool (ID='worker') created along with the cluster can be deleted as long as there is one machine pool within the cluster that contains no taints and at least two instances for a single-AZ cluster or three instances for a multi-AZ cluster.
21+
====
22+
1823
.Prerequisites
1924

2025
ifdef::openshift-rosa[]

modules/deleting-machine-pools.adoc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
= Deleting a machine pool
88

99
You can delete a machine pool in the event that your workload requirements have changed and your current machine pools no longer meet your needs.
10-
// Over time, users may find that their workload needs have changed, and may want to modify the various machine pool settings. While many of these settings can be modified, certain settings (for example, instance types and availability zones) cannot be changed once a machine pool is created. If a user finds that these settings are no longer meeting their needs, they can delete the machine pool in question and create a new machine pool with the desired settings.
10+
1111

1212
You can delete machine pools using the
1313
ifdef::openshift-rosa[]
@@ -16,12 +16,13 @@ endif::openshift-rosa[]
1616
ifndef::openshift-rosa[]
1717
Openshift Cluster Manager.
1818
endif::[]
19+
ifndef::openshift-rosa[]
1920

21+
[NOTE]
22+
====
23+
For users of ROSA CLI `rosa` version 1.2.25 and prior versions, the machine pool (ID='Default') created along with the cluster cannot be deleted. For users of ROSA CLI `rosa` version 1.2.26 and beyond, the machine pool (ID='worker') created along with the cluster can be deleted as long as there is one machine pool within the cluster that contains no taints and at least two instances for a single-AZ cluster or three instances for a multi-AZ cluster.
24+
====
2025

21-
// Users that wish to delete the default machine pool that is automatically created during the installation of a {product-title} (ROSA) cluster can do so using the OCM or ROSA CLI.
22-
//
23-
24-
ifndef::openshift-rosa[]
2526
.Prerequisites
2627

2728
* You have created an {product-title} cluster.

modules/rosa-adding-taints-cli.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010

1111
You can add taints to a machine pool for your Red Hat OpenShift Service on AWS (ROSA) cluster by using the ROSA CLI.
1212

13+
[NOTE]
14+
====
15+
For users of ROSA CLI `rosa` version 1.2.25 and prior versions, the number of taints cannot be changed within the machine pool (ID='Default') created along with the cluster. cannot be deleted. For users of ROSA CLI `rosa` version 1.2.26 and beyond, the number of taints can be changed within the machine pool (ID='worker') created along with the cluster.
16+
====
1317
.Prerequisites
1418

1519
ifdef::openshift-rosa[]

modules/rosa-adding-taints-ocm.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010

1111
You can add taints to a machine pool for your Red Hat OpenShift Service on AWS (ROSA) cluster by using OpenShift Cluster Manager.
1212

13+
[NOTE]
14+
====
15+
For users of ROSA CLI `rosa` version 1.2.25 and prior versions, the number of taints cannot be changed within the machine pool (ID='Default') created along with the cluster. For users of ROSA CLI `rosa` version 1.2.26 and beyond, the number of taints can be changed within the machine pool (ID='worker') created along with the cluster.
16+
====
1317
.Prerequisites
1418

1519
ifndef::openshift-rosa[]

rosa_cluster_admin/rosa_nodes/rosa-nodes-machinepools-about.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@ By default, a cluster has one machine pool. During cluster installation, you can
3131

3232
[NOTE]
3333
====
34-
For users of ROSA CLI `rosa` version 1.2.25 and prior versions, the default machine pool is identified as `Default`. For users of ROSA CLI `rosa` version 1.2.26 and beyond, the default machine pool is identified as `Worker`.
34+
For users of ROSA CLI `rosa` version 1.2.25 and prior versions, the machine pool (ID='Default') created along with the cluster cannot be deleted. For users of ROSA CLI `rosa` version 1.2.26 and beyond, the machine pool (ID='worker') created along with the cluster can be deleted as long as there is one machine pool within the cluster that contains no taints and at least two instances for a single-AZ cluster or three instances for a multi-AZ cluster.
3535
====
3636

3737
After a cluster's installation:
3838

39-
* You can relabel a `Default` machine pool.
39+
* You can relabel the machine pool that was created along with the cluster.
4040
* You can add additional machine pools to an existing cluster.
4141
+
4242
[NOTE]
4343
====
4444
You cannot change the machine pool node type or size. The machine pool node type or size is specified during their creation only. If you need a different node type or size, you must re-create a machine pool and specify the required node type or size values.
4545
====
4646
* You can add a label to each added machine pool.
47-
* You can delete machine pools.
47+
* You can delete machine pools as long as there is at least one machine pool within the cluster that contains no taints and at least two instances for a single-AZ cluster or three instances for a multi-AZ cluster.
4848

4949
Multiple machine pools can exist on a single cluster, and each machine pool can contain a unique node type and node size configuration.
5050

0 commit comments

Comments
 (0)