BZ1878374 specifying supported instance types

Author: kalexand-rh

installing/installing_aws/installing-aws-customizations.adoc

@@ -56,6 +56,8 @@ include::modules/installation-initializing.adoc[leveloffset=+1]
 
 include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
 
+include::modules/installation-supported-aws-machine-types.adoc[leveloffset=+2]
+
 include::modules/installation-aws-config-yaml.adoc[leveloffset=+2]
 
 // Removing; Proxy not supported for AWS IPI for 4.2

installing/installing_aws/installing-aws-government-region.adoc

@@ -56,6 +56,7 @@ include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
 
 include::modules/installation-initializing-manual.adoc[leveloffset=+1]
 include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
+include::modules/installation-supported-aws-machine-types.adoc[leveloffset=+2]
 include::modules/installation-aws-config-yaml.adoc[leveloffset=+2]
 include::modules/installation-aws-regions-with-no-ami.adoc[leveloffset=+2]
 include::modules/installation-aws-upload-custom-rhcos-ami.adoc[leveloffset=+2]

installing/installing_aws/installing-aws-network-customizations.adoc

@@ -60,6 +60,8 @@ include::modules/installation-initializing.adoc[leveloffset=+1]
 
 include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
 
+include::modules/installation-supported-aws-machine-types.adoc[leveloffset=+2]
+
 include::modules/installation-aws-config-yaml.adoc[leveloffset=+2]
 
 // Removing; Proxy not supported for AWS IPI for 4.2

installing/installing_aws/installing-aws-private.adoc

@@ -55,6 +55,8 @@ include::modules/installation-initializing-manual.adoc[leveloffset=+1]
 
 include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
 
+include::modules/installation-supported-aws-machine-types.adoc[leveloffset=+2]
+
 include::modules/installation-aws-config-yaml.adoc[leveloffset=+2]
 
 include::modules/installation-configure-proxy.adoc[leveloffset=+2]

installing/installing_aws/installing-aws-user-infra.adoc

@@ -45,6 +45,8 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1]
 
 include::modules/installation-aws-user-infra-requirements.adoc[leveloffset=+1]
 
+include::modules/installation-supported-aws-machine-types.adoc[leveloffset=+2]
+
 include::modules/installation-aws-permissions.adoc[leveloffset=+2]
 
 include::modules/installation-obtaining-installer.adoc[leveloffset=+1]

installing/installing_aws/installing-aws-vpc.adoc

@@ -51,6 +51,8 @@ include::modules/installation-initializing.adoc[leveloffset=+1]
 
 include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
 
+include::modules/installation-supported-aws-machine-types.adoc[leveloffset=+2]
+
 include::modules/installation-aws-config-yaml.adoc[leveloffset=+2]
 
 include::modules/installation-configure-proxy.adoc[leveloffset=+2]

installing/installing_aws/installing-restricted-networks-aws.adoc

@@ -66,6 +66,8 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1]
 
 include::modules/installation-aws-user-infra-requirements.adoc[leveloffset=+1]
 
+include::modules/installation-supported-aws-machine-types.adoc[leveloffset=+2]
+
 include::modules/installation-aws-permissions.adoc[leveloffset=+2]
 
 //You extract the installation program from the mirrored content.

modules/installation-aws-user-infra-requirements.adoc

@@ -21,172 +21,6 @@ By using the provided CloudFormation templates, you can create stacks of AWS res
 
 Alternatively, you can manually create the components or you can reuse existing infrastructure that meets the cluster requirements. Review the CloudFormation templates for more details about how the components interrelate.
 
-[id="installation-aws-user-infra-cluster-machines_{context}"]
-== Cluster machines
-
-You need `AWS::EC2::Instance` objects for the following machines:
-
-* A bootstrap machine. This machine is required during installation, but you can remove it after your cluster deploys.
-* Three control plane machines. The control plane machines are not governed by a machine set.
-* Compute machines. You must create at least two compute machines, which are also known as worker machines, during installation. These machines are not governed by a machine set.
-
-////
-You can also create and control them by using a MachineSet after your
-control plane initializes and you can access the cluster API by using the `oc`
-command line interface.
-////
-
-You can use the following instance types for the cluster machines with the provided CloudFormation templates.
-
-
-[IMPORTANT]
-====
-If `m4` instance types are not available in your region, such as with `eu-west-3`, use `m5` types instead.
-====
-
-.Instance types for machines
-[cols="2a,2a,2a,2a",options="header"]
-|===
-
-|Instance type
-|Bootstrap
-|Control plane
-|Compute
-
-|`i3.large`
-|x
-|
-|
-
-| `m4.large`
-|
-|
-|x
-
-| `m4.xlarge`
-|
-|x
-|x
-
-| `m4.2xlarge`
-|
-|x
-|x
-
-| `m4.4xlarge`
-|
-|x
-|x
-
-| `m4.8xlarge`
-|
-|x
-|x
-
-| `m4.10xlarge`
-|
-|x
-|x
-
-| `m4.16xlarge`
-|
-|x
-|x
-
-| `m5.large`
-|
-|
-|x
-
-| `m5.xlarge`
-|
-|x
-|x
-
-| `m5.2xlarge`
-|
-|x
-|x
-
-| `m5.4xlarge`
-|
-|x
-|x
-
-| `m5.8xlarge`
-|
-|x
-|x
-
-| `m5.10xlarge`
-|
-|x
-|x
-
-| `m5.16xlarge`
-|
-|x
-|x
-
-| `c4.large`
-|
-|
-|x
-
-| `c4.xlarge`
-|
-|
-|x
-
-| `c4.2xlarge`
-|
-|x
-|x
-
-| `c4.4xlarge`
-|
-|x
-|x
-
-| `c4.8xlarge`
-|
-|x
-|x
-
-| `r4.large`
-|
-|
-|x
-
-| `r4.xlarge`
-|
-|x
-|x
-
-| `r4.2xlarge`
-|
-|x
-|x
-
-| `r4.4xlarge`
-|
-|x
-|x
-
-| `r4.8xlarge`
-|
-|x
-|x
-
-| `r4.16xlarge`
-|
-|x
-|x
-
-|===
-
-You might be able to use other instance types that meet the specifications of these instance types.
-
 [id="csr-management-aws_{context}"]
 == Certificate signing requests management
 
@@ -589,3 +423,21 @@ or the following individual permissions.
 |`*`
 
 |===
+
+[id="installation-aws-user-infra-cluster-machines_{context}"]
+== Cluster machines
+
+You need `AWS::EC2::Instance` objects for the following machines:
+
+* A bootstrap machine. This machine is required during installation, but you
+can remove it after your cluster deploys.
+* At least three control plane machines. The control plane machines are not
+governed by a MachineSet.
+* Compute machines. You must create at least two compute machines, which are also known as worker machines,
+during installation. These machines are not governed by a MachineSet.
+
+////
+You can also create and control them by using a MachineSet after your
+control plane initializes and you can access the cluster API by using the `oc`
+command line interface.
+////

modules/installation-configuration-parameters.adoc

@@ -169,7 +169,7 @@ The string must be 14 characters or fewer long.
 endif::osp[]
 
 |`platform`
-|The configuration for the specific platform upon which to perform the installation: `aws`, `baremetal`, `azure`, `openstack`, `ovirt`, `vsphere`. For additional information about `platform.<platform>` parameters, consult the following table for your specific platform.
+|The configuration for the specific platform upon which to perform the installation: `aws`, `baremetal`, `azure`, `openstack`, `ovirt`, `vsphere`. For additional information about `platform.<platform>` parameters, consult the table for your specific platform that follows.
 |Object
 
 ifndef::openshift-origin[]
@@ -206,7 +206,7 @@ endif::[]
 
 |`compute`
 |The configuration for the machines that comprise the compute nodes.
-|Array of machine-pool objects. For details, see the following "Machine-pool" table.
+|Array of `MachinePool` objects. For details, see the following "Machine-pool" table.
 
 |`compute.architecture`
 |Determines the instruction set architecture of the machines in the pool. Currently, heteregeneous clusters are not supported, so all pools must specify the same architecture. Valid values are `amd64` (the default).
@@ -420,7 +420,8 @@ such as `io1`.
 
 |`compute.platform.aws.type`
 |The EC2 instance type for the compute machines.
-|Valid link:https://aws.amazon.com/ec2/instance-types/[AWS instance type], such as `c5.9xlarge`.
+|Valid AWS instance type, such as `m4.2xlarge`. See the *Instance types for machines* table that follows.
+//add an xref when possible.
 
 |`compute.platform.aws.zones`
 |The availability zones where the installation program creates machines for the compute machine pool. If you provide your own VPC, you must provide a subnet in that availability zone.
@@ -441,7 +442,8 @@ link:https://yaml.org/spec/1.2/spec.html#sequence//[YAML sequence].
 
 |`controlPlane.platform.aws.type`
 |The EC2 instance type for the control plane machines.
-|Valid link:https://aws.amazon.com/ec2/instance-types/[AWS instance type], such as `c5.9xlarge`.
+|Valid AWS instance type, such as `m5.xlarge`. See the *Instance types for machines* table that follows.
+//add an xref when possible
 
 |`controlPlane.platform.aws.zones`
 |The availability zones where the installation program creates machines for the

modules/installation-creating-aws-control-plane.adoc

@@ -91,7 +91,7 @@ requires:
   },
   {
     "ParameterKey": "MasterInstanceType", <21>
-    "ParameterValue": "m4.xlarge" <22>
+    "ParameterValue": "m5.xlarge" <22>
   },
   {
     "ParameterKey": "AutoRegisterELB", <23>
@@ -150,32 +150,12 @@ directory. This value is the long string with the format
 the CloudFormation template for the security group and roles.
 <21> The type of AWS instance to use for the control plane machines.
 <22> Allowed values:
-* `m4.xlarge`
-* `m4.2xlarge`
-* `m4.4xlarge`
-* `m4.8xlarge`
-* `m4.10xlarge`
-* `m4.16xlarge`
-* `m5.xlarge`
-* `m5.2xlarge`
-* `m5.4xlarge`
-* `m5.8xlarge`
-* `m5.10xlarge`
-* `m5.16xlarge`
-* `c4.2xlarge`
+* `m5a.xlarge`
+* `c5a.2xlarge`
+* `r5.xlarge`
+* `r5a.xlarge`
 * `c4.4xlarge`
-* `c4.8xlarge`
-* `r4.xlarge`
-* `r4.2xlarge`
-* `r4.4xlarge`
-* `r4.8xlarge`
-* `r4.16xlarge`
-+
-[IMPORTANT]
-====
-If `m4` instance types are not available in your region, such as with
-`eu-west-3`, specify an `m5` type, such as `m5.xlarge`, instead.
-====
+* `m5.xlarge`
 <23> Whether or not to register a network load balancer (NLB).
 <24> Specify `yes` or `no`. If you specify `yes`, you must provide a Lambda
 Amazon Resource Name (ARN) value.