OSDOCS-3326: ARM updates to AWS UPI install

Author: kelbrown20

installing/installing-preparing.adoc

@@ -181,7 +181,7 @@ ifndef::openshift-origin[]
 |Restricted network
 |
 |xref:../installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc#installing-restricted-networks-aws-installer-provisioned[X]
-|
+|xref:../installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc#installing-restricted-networks-aws-installer-provisioned[X]
 |
 |
 |xref:../installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc#installing-restricted-networks-gcp-installer-provisioned[X]
@@ -437,11 +437,12 @@ endif::openshift-origin[]
 //This table is for all flavors of OpenShift, except OKD. A separate table is required because OKD does not support multiple AWS architecture types. Trying to maintain one table using conditions, while convenient, is very fragile and prone to publishing errors.
 ifndef::openshift-origin[]
 |===
-||Alibaba |AWS |Azure |Azure Stack Hub |GCP |{rh-openstack} |{rh-openstack} on SR-IOV |RHV |Bare metal (x86_64) |Bare metal (arm64) |vSphere |VMC |IBM Cloud VPC |IBM Z |IBM Z with {op-system-base} KVM |IBM Power |Platform agnostic
+||Alibaba |AWS (x86_64) |AWS (arm64) |Azure |Azure Stack Hub |GCP |{rh-openstack} |{rh-openstack} on SR-IOV |RHV |Bare metal (x86_64) |Bare metal (arm64) |vSphere |VMC |IBM Cloud VPC |IBM Z |IBM Z with {op-system-base} KVM |IBM Power |Platform agnostic
 
 |Custom
 |
 |xref:../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[X]
+|xref:../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[X]
 |xref:../installing/installing_azure/installing-azure-user-infra.adoc#installing-azure-user-infra[X]
 |xref:../installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[X]
 |xref:../installing/installing_gcp/installing-gcp-user-infra.adoc#installing-gcp-user-infra[X]
@@ -466,6 +467,7 @@ ifndef::openshift-origin[]
 |
 |
 |
+|
 |xref:../installing/installing_openstack/installing-openstack-user-kuryr.adoc#installing-openstack-user-kuryr[X]
 |
 |
@@ -482,6 +484,7 @@ ifndef::openshift-origin[]
 |Restricted network
 |
 |xref:../installing/installing_aws/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[X]
+|xref:../installing/installing_aws/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[X]
 |
 |
 |xref:../installing/installing_gcp/installing-restricted-networks-gcp.adoc#installing-restricted-networks-gcp[X]
@@ -503,6 +506,7 @@ ifndef::openshift-origin[]
 |
 |
 |
+|
 |xref:../installing/installing_gcp/installing-gcp-user-infra-vpc.adoc#installing-gcp-user-infra-vpc[X]
 |
 |

modules/installation-aws-ami-stream-metadata.adoc

@@ -32,6 +32,7 @@ or `arm64`
 endif::openshift-origin[]
 AMI for an AWS region, such as `us-west-1`:
 +
+.For x86_64
 [source,terminal]
 ----
 $ openshift-install coreos print-stream-json | jq -r '.architectures.x86_64.images.aws.regions["us-west-1"].image'
@@ -43,4 +44,18 @@ $ openshift-install coreos print-stream-json | jq -r '.architectures.x86_64.imag
 ami-0d3e625f84626bbda
 ----
 +
+ifndef::openshift-origin[]
+.For arm64
+[source,terminal]
+----
+$ openshift-install coreos print-stream-json | jq -r '.architectures.aarch64.images.aws.regions["us-west-1"].image'
+----
++
+.Example output 
+[source,terminal]
+----
+ami-0af1d3b7fa5be2131
+----
++
+endif::openshift-origin[]
 The output of this command is the AWS AMI ID for your designated architecture and the `us-west-1` region. The AMI must belong to the same region as the cluster.

modules/installation-aws-upload-custom-rhcos-ami.adoc

@@ -143,7 +143,11 @@ $ aws ec2 register-image \
    --root-device-name '/dev/xvda' \
    --block-device-mappings 'DeviceName=/dev/xvda,Ebs={DeleteOnTermination=true,SnapshotId=<snapshot_ID>}' <4>
 ----
-<1> The {op-system} VMDK architecture type, like `x86_64`, `s390x`, or `ppc64le`.
+<1> The {op-system} VMDK architecture type, like `x86_64`, 
+ifndef::openshift-origin[]
+`arm64`, 
+endif::openshift-origin[]
+`s390x`, or `ppc64le`.
 <2> The `Description` from the imported snapshot.
 <3> The name of the {op-system} AMI.
 <4> The `SnapshotID` from the imported snapshot.

modules/installation-configuration-parameters.adoc

@@ -73,9 +73,8 @@ endif::[]
 ifeval::["{context}" == "installing-aws-vpc"]
 :aws:
 endif::[]
-//Starting in 4.10, aws on arm64 is only supported for installation on custom, network custom, private clusters and VPC. This attribute excludes arm64 content from installing in restricted networks upi. When restricted networks upi is supported on arm64, change `aws-restricted` to `aws`.
 ifeval::["{context}" == "installing-restricted-networks-aws-installer-provisioned"]
-:aws-restricted:
+:aws:
 endif::[]
 ifeval::["{context}" == "installing-azure-customizations"]
 :azure:
@@ -652,10 +651,10 @@ endif::openshift-origin[]
 |`publish`
 |How to publish or expose the user-facing endpoints of your cluster, such as the Kubernetes API, OpenShift routes.
 |
-ifdef::aws,aws-govcloud,aws-secret,aws-restricted,azure,gcp[]
+ifdef::aws,aws-govcloud,aws-secret,azure,gcp[]
 `Internal` or `External`. To deploy a private cluster, which cannot be accessed from the internet, set `publish` to `Internal`. The default value is `External`.
 endif::[]
-ifndef::aws,aws-govcloud,aws-secret,aws-restricted,azure,gcp[]
+ifndef::aws,aws-govcloud,aws-secret,azure,gcp[]
 `Internal` or `External`. The default value is `External`.
 
 Setting this field to `Internal` is not supported on non-cloud platforms and IBM Cloud VPC.
@@ -677,7 +676,7 @@ a|For example, `sshKey: ssh-ed25519 AAAA..`.
 
 |====
 
-ifdef::aws,aws-govcloud,aws-secret,aws-restricted[]
+ifdef::aws,aws-govcloud,aws-secret[]
 [id="installation-configuration-parameters-optional-aws_{context}"]
 == Optional AWS configuration parameters
 
@@ -782,7 +781,7 @@ host must trust the certificate.
 |Valid subnet IDs.
 
 |====
-endif::aws,aws-govcloud,aws-secret,aws-restricted[]
+endif::aws,aws-govcloud,aws-secret[]
 
 ifdef::osp[]
 [id="installation-configuration-parameters-additional-osp_{context}"]
@@ -1550,7 +1549,7 @@ ifeval::["{context}" == "installing-aws-vpc"]
 :!aws:
 endif::[]
 ifeval::["{context}" == "installing-restricted-networks-aws-installer-provisioned"]
-:!aws-restricted:
+:!aws:
 endif::[]
 ifeval::["{context}" == "installing-azure-customizations"]
 :!azure:

modules/installation-creating-aws-bootstrap.adoc

@@ -147,7 +147,7 @@ requires:
 config files for the cluster.
 <2> Specify the infrastructure name that you extracted from the Ignition config
 file metadata, which has the format `<cluster-name>-<random-string>`.
-<3> Current {op-system-first} AMI to use for the bootstrap node.
+<3> Current {op-system-first} AMI to use for the bootstrap node based on your selected architecture.
 <4> Specify a valid `AWS::EC2::Image::Id` value.
 <5> CIDR block to allow SSH access to the bootstrap node.
 <6> Specify a CIDR block in the format `x.x.x.x/16-24`.

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

@@ -92,7 +92,7 @@ requires:
   },
   {
     "ParameterKey": "MasterInstanceType", <21>
-    "ParameterValue": "m6i.xlarge" <22>
+    "ParameterValue": "" <22>
   },
   {
     "ParameterKey": "AutoRegisterELB", <23>
@@ -120,7 +120,7 @@ requires:
 config files for the cluster.
 <2> Specify the infrastructure name that you extracted from the Ignition config
 file metadata, which has the format `<cluster-name>-<random-string>`.
-<3> Current{op-system-first} AMI to use for the control plane machines.
+<3> Current {op-system-first} AMI to use for the control plane machines based on your selected architecture.
 <4> Specify an `AWS::EC2::Image::Id` value.
 <5> Whether or not to perform DNS etcd registration.
 <6> Specify `yes` or `no`. If you specify `yes`, you must provide hosted zone
@@ -149,9 +149,12 @@ directory. This value is the long string with the format
 <19> The IAM profile to associate with control plane nodes.
 <20> Specify the `MasterInstanceProfile` parameter value from the output of
 the CloudFormation template for the security group and roles.
-<21> The type of AWS instance to use for the control plane machines.
+<21> The type of AWS instance to use for the control plane machines based on your selected architecture.
 <22> The instance type value corresponds to the minimum resource requirements for
-control plane machines.
+control plane machines. For example `m6i.xlarge` is a type for `x86_64`
+ifndef::openshift-origin[]
+and `m6g.xlarge` is a type for `arm64`.
+endif::openshift-origin[]
 <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.

modules/installation-creating-aws-worker.adoc

@@ -78,15 +78,15 @@ template requires:
   },
   {
     "ParameterKey": "WorkerInstanceType", <15>
-    "ParameterValue": "m6i.large" <16>
+    "ParameterValue": "" <16>
   }
 ]
 ----
 <1> The name for your cluster infrastructure that is encoded in your Ignition
 config files for the cluster.
 <2> Specify the infrastructure name that you extracted from the Ignition config
 file metadata, which has the format `<cluster-name>-<random-string>`.
-<3> Current {op-system-first} AMI to use for the worker nodes.
+<3> Current {op-system-first} AMI to use for the worker nodes based on your selected architecture.
 <4> Specify an `AWS::EC2::Image::Id` value.
 <5> A subnet, preferably private, to launch the worker nodes on.
 <6> Specify a subnet from the `PrivateSubnets` value from the output of the
@@ -104,10 +104,12 @@ directory. This value is the long string with the format
 <13> The IAM profile to associate with worker nodes.
 <14> Specify the `WorkerInstanceProfile` parameter value from the output of
 the CloudFormation template for the security group and roles.
-<15> The type of AWS instance to use for the compute machines.
+<15> The type of AWS instance to use for the compute machines based on your selected architecture.
 <16> The instance type value corresponds to the minimum resource requirements
-for compute machines.
-
+for compute machines. For example `m6i.large` is a type for `x86_64`
+ifndef::openshift-origin[]
+ and `m6g.large` is a type for `arm64`.
+endif::openshift-origin[]
 . Copy the template from the *CloudFormation template for worker machines*
 section of this topic and save it as a YAML file on your computer. This template
 describes the networking objects and load balancers that your cluster requires.

modules/installation-supported-aws-machine-types.adoc

@@ -10,10 +10,6 @@
 // * installing/installing_aws/installing-aws-private.adoc
 // * installing/installing_aws/installing-aws-china.adoc
 
-//Starting in 4.10, aws on arm64 is only supported for installation on custom, network custom, private clusters and VPC. This attribute excludes arm64 content from installing in restricted networks upi. When restricted networks upi is supported on arm64, remove this ifdevel.
-ifeval::["{context}" == "installing-restricted-networks-aws"]
-:aws-restricted-upi:
-endif::[]
 //Starting in 4.10, aws on arm64 is only supported for installation on custom, network custom, private clusters and VPC. This attribute excludes arm64 content from installing on gov regions. When government regions are supported on arm64, remove this ifdevel.
 ifeval::["{context}" == "installing-aws-government-region"]
 :aws-govcloud:
@@ -412,7 +408,7 @@ The following Amazon Web Services (AWS) instance types are supported with {produ
 |===
 ====
 
-ifndef::aws-restricted-upi,aws-govcloud,aws-secret,aws-china,openshift-origin[]
+ifndef::aws-govcloud,aws-secret,aws-china,openshift-origin[]
 .Machine types based on arm64 architecture
 [%collapsible]
 ====