Updating 4.13+ and main branches per new architecutre guidelines

kelbrown20 · kelbrown20 · commit ccf501c21aa2 · 2023-05-16T14:28:17.000-04:00
diff --git a/installing/installing-preparing.adoc b/installing/installing-preparing.adoc
@@ -18,12 +18,12 @@ Before you install an {product-title} cluster, you need to select the best insta
 If you want to install and manage {product-title} yourself, you can install it on the following platforms:
 
 * Alibaba Cloud
-* Amazon Web Services (AWS) on `x86_64` instances
+* Amazon Web Services (AWS) on 64-bit x86 instances
 ifndef::openshift-origin[]
-* Amazon Web Services (AWS) on `arm64` instances
+* Amazon Web Services (AWS) on 64-bit ARM instances
 endif::openshift-origin[]
-* Microsoft Azure on `x86_64` instances
-* Microsoft Azure on `arm64` instances
+* Microsoft Azure on 64-bit x86 instances
+* Microsoft Azure on 64-bit ARM instances
 * Microsoft Azure Stack Hub
 * Google Cloud Platform (GCP)
 * {rh-openstack-first}
@@ -129,7 +129,7 @@ Not all installation options are supported for all platforms, as shown in the fo
 //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 (x86_64) |AWS (arm64) |Azure (x86_64) |Azure (arm64)|Azure Stack Hub |GCP |Nutanix |{rh-openstack} |RHV |Bare metal (x86_64) |Bare metal (arm64) |vSphere |VMC |IBM Cloud VPC |{ibmzProductName} |{ibmpowerProductName} |{ibmpowerProductName} Virtual Server 
+||Alibaba |AWS (64-bit x86) |AWS (64-bit ARM) |Azure (64-bit x86) |Azure (64-bit ARM)|Azure Stack Hub |GCP |Nutanix |{rh-openstack} |RHV |Bare metal (64-bit x86) |Bare metal (64-bit ARM) |vSphere |VMC |IBM Cloud VPC |{ibmzProductName} |{ibmpowerProductName} |{ibmpowerProductName} Virtual Server 
 
 |Default
 |xref:../installing/installing_alibaba/installing-alibaba-default.adoc#installing-alibaba-default[&#10003;]
@@ -469,7 +469,7 @@ 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 (x86_64) |AWS (arm64) |Azure (x86_64) |Azure (arm64) |Azure Stack Hub |GCP |Nutanix |{rh-openstack} |RHV |Bare metal (x86_64) |Bare metal (arm64) |vSphere |VMC |IBM Cloud VPC |{ibmzProductName} |{ibmzProductName} with {op-system-base} KVM |{ibmpowerProductName} |Platform agnostic
+||Alibaba |AWS (64-bit x86) |AWS (64-bit ARM) |Azure (64-bit x86) |Azure (64-bit ARM) |Azure Stack Hub |GCP |Nutanix |{rh-openstack} |RHV |Bare metal (64-bit x86) |Bare metal (64-bit ARM) |vSphere |VMC |IBM Cloud VPC |{ibmzProductName} |{ibmzProductName} with {op-system-base} KVM |{ibmpowerProductName} |Platform agnostic
 
 |Custom
 |
diff --git a/installing/installing_on_prem_assisted/installing-on-prem-assisted.adoc b/installing/installing_on_prem_assisted/installing-on-prem-assisted.adoc
@@ -6,7 +6,7 @@ include::_attributes/common-attributes.adoc[]
 
 toc::[]
 
-You can install {product-title} on on-premise hardware or on-premise VMs using the {ai-full}. Installing {product-title} using the {ai-full} supports both x86-64 and arm64 CPU architectures.
+You can install {product-title} on on-premise hardware or on-premise VMs using the {ai-full}. Installing {product-title} using the {ai-full} supports both x86-64 and AArch64 CPU architectures.
 
 include::modules/assisted-installer-using-the-assisted-installer.adoc[leveloffset=+1]
 
diff --git a/modules/architecture-rhcos-updating-bootloader.adoc b/modules/architecture-rhcos-updating-bootloader.adoc
@@ -41,7 +41,7 @@ Component EFI
 ----
 ifndef::openshift-origin[]
 +
-.Example output for `arm64`
+.Example output for `aarch64`
 [source, terminal]
 ----
 Component EFI
diff --git a/modules/assisted-installer-setting-the-cluster-details.adoc b/modules/assisted-installer-setting-the-cluster-details.adoc
@@ -35,7 +35,7 @@ The base domain must be a valid DNS name. You must not have a wild card domain s
 
 . Optional: The {ai-full} already has the pull secret associated to your account. If you want to use a different pull secret, select *Edit pull secret*.
 
-. Optional: {ai-full} defaults to using `x86_64` CPU architecture. If you are installing {product-title} on `arm64` CPUs, select *Use arm64 CPU architecture*. Keep in mind, some features are not available with `arm64` CPU architecture.
+. Optional: {ai-full} defaults to using x86_64 CPU architecture. If you are installing {product-title} on 64-bit ARM CPUs, select *Use arm64 CPU architecture*. Keep in mind, some features are not available with 64-bit ARM CPU architecture.
 
 . Optional: If you are using a static IP configuration for the cluster nodes instead of DHCP reservations, select *Static network configuration*.
 
diff --git a/modules/installation-aws-ami-stream-metadata.adoc b/modules/installation-aws-ami-stream-metadata.adoc
@@ -28,7 +28,7 @@ To parse the stream metadata, use one of the following methods:
 
 ** Print the current `x86_64`
 ifndef::openshift-origin[]
-or `arm64`
+or `aarch64`
 endif::openshift-origin[]
 AMI for an AWS region, such as `us-west-1`:
 +
@@ -45,7 +45,7 @@ ami-0d3e625f84626bbda
 ----
 +
 ifndef::openshift-origin[]
-.For arm64
+.For aarch64
 [source,terminal]
 ----
 $ openshift-install coreos print-stream-json | jq -r '.architectures.aarch64.images.aws.regions["us-west-1"].image'
diff --git a/modules/installation-aws-arm-tested-machine-types.adoc b/modules/installation-aws-arm-tested-machine-types.adoc
@@ -10,16 +10,16 @@
 // installing/installing_aws/installing-restricted-networks-aws.adoc
 
 [id="installation-aws-arm-tested-machine-types_{context}"]
-= Tested instance types for AWS ARM
+= Tested instance types for AWS on 64-bit ARM infrastructures
 
-The following Amazon Web Services (AWS) ARM instance types have been tested with {product-title}.
+The following Amazon Web Services (AWS) 64-bit ARM instance types have been tested with {product-title}.
 
 [NOTE]
 ====
 Use the machine types included in the following charts for your AWS ARM instances. If you use an instance type that is not listed in the chart, ensure that the instance size you use matches the minimum resource requirements that are listed in "Minimum resource requirements for cluster installation". 
 ====
 
-.Machine types based on arm64 architecture
+.Machine types based on 64-bit ARM architecture 
 [%collapsible]
 ====
 include::https://raw.githubusercontent.com/openshift/installer/master/docs/user/aws/tested_instance_types_aarch64.md[]
diff --git a/modules/installation-aws-tested-machine-types.adoc b/modules/installation-aws-tested-machine-types.adoc
@@ -31,14 +31,14 @@ Use the machine types included in the following charts for your AWS instances. I
 ====
 
 ifndef::localzone[]
-.Machine types based on x86_64 architecture
+.Machine types based on 64-bit x86 architecture
 [%collapsible]
 ====
 include::https://raw.githubusercontent.com/openshift/installer/master/docs/user/aws/tested_instance_types_x86_64.md[]
 ====
 endif::localzone[]
 ifdef::localzone[]
-.Machine types based on x86_64 architecture for AWS Local Zones
+.Machine types based on 64-bit x86 architecture for AWS Local Zones
 [%collapsible]
 ====
 * `c5.*`
diff --git a/modules/installation-aws-upload-custom-rhcos-ami.adoc b/modules/installation-aws-upload-custom-rhcos-ami.adoc
@@ -145,7 +145,7 @@ $ aws ec2 register-image \
 ----
 <1> The {op-system} VMDK architecture type, like `x86_64`, 
 ifndef::openshift-origin[]
-`arm64`, 
+`aarch64`, 
 endif::openshift-origin[]
 `s390x`, or `ppc64le`.
 <2> The `Description` from the imported snapshot.
diff --git a/modules/installation-aws-user-infra-rhcos-ami.adoc b/modules/installation-aws-user-infra-rhcos-ami.adoc
@@ -111,7 +111,7 @@ ifndef::openshift-origin[]
 
 |===
 
-.arm64 {op-system} AMIs
+.aarch64 {op-system} AMIs
 
 [cols="2a,2a",options="header"]
 |===
diff --git a/modules/installation-azure-arm-tested-machine-types.adoc b/modules/installation-azure-arm-tested-machine-types.adoc
@@ -9,11 +9,11 @@
 // installing/installing_azure/installing-azure-vnet.adoc
 
 [id="installation-azure-arm-tested-machine-types_{context}"]
-= Tested instance types for Azure ARM
+= Tested instance types for Azure on 64-bit ARM infrastructures
 
-The following Microsoft Azure instance types have been tested with {product-title}.
+The following Microsoft Azure ARM64 instance types have been tested with {product-title}.
 
-.Machine types
+.Machine types based on 64-bit ARM architecture
 [%collapsible]
 ====
 include::https://raw.githubusercontent.com/openshift/installer/master/docs/user/azure/tested_instance_types_aarch64.md[] 
diff --git a/modules/installation-azure-marketplace-subscribe.adoc b/modules/installation-azure-marketplace-subscribe.adoc
@@ -37,7 +37,7 @@ endif::mapi[]
 
 [IMPORTANT]
 ====
-Installing images with the Azure marketplace is not supported on clusters with `arm64` instances. 
+Installing images with the Azure marketplace is not supported on clusters with 64-bit ARM instances. 
 ====
 
 .Prerequisites
diff --git a/modules/installation-azure-tested-machine-types.adoc b/modules/installation-azure-tested-machine-types.adoc
@@ -12,7 +12,7 @@
 
 The following Microsoft Azure instance types have been tested with {product-title}.
 
-.Machine types
+.Machine types based on 64-bit x86 architecture
 [%collapsible]
 ====
 include::https://raw.githubusercontent.com/openshift/installer/master/docs/user/azure/tested_instance_types_x86_64.md[]
diff --git a/modules/installation-creating-aws-control-plane.adoc b/modules/installation-creating-aws-control-plane.adoc
@@ -151,9 +151,9 @@ 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 based on your selected architecture.
 <22> The instance type value corresponds to the minimum resource requirements for
-control plane machines. For example `m6i.xlarge` is a type for `x86_64`
+control plane machines. For example `m6i.xlarge` is a type for AMD64
 ifndef::openshift-origin[]
-and `m6g.xlarge` is a type for `arm64`.
+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
diff --git a/modules/installation-creating-aws-worker.adoc b/modules/installation-creating-aws-worker.adoc
@@ -119,9 +119,9 @@ directory. This value is the long string with the format
 the CloudFormation template for the security group and roles.
 <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 example `m6i.large` is a type for `x86_64`
+for compute machines. For example `m6i.large` is a type for AMD64
 ifndef::openshift-origin[]
- and `m6g.large` is a type for `arm64`.
+ 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
diff --git a/modules/installation-user-infra-machines-pxe.adoc b/modules/installation-user-infra-machines-pxe.adoc
@@ -207,7 +207,7 @@ This configuration does not enable serial console access on machines with a grap
 ifndef::only-pxe[]
 ** For iPXE (`x86_64`
 ifndef::openshift-origin[]
-+ `arm64`
++ `aarch64`
 endif::openshift-origin[]
 ):
 +
@@ -234,12 +234,12 @@ This configuration does not enable serial console access on machines with a grap
 ifndef::openshift-origin[]
 [NOTE]
 ====
-To network boot the CoreOS `kernel` on `arm64` architecture, you need to use a version of iPXE build with the `IMAGE_GZIP` option enabled. See link:https://ipxe.org/buildcfg/image_gzip[`IMAGE_GZIP` option in iPXE].
+To network boot the CoreOS `kernel` on `aarch64` architecture, you need to use a version of iPXE build with the `IMAGE_GZIP` option enabled. See link:https://ipxe.org/buildcfg/image_gzip[`IMAGE_GZIP` option in iPXE].
 ====
 endif::openshift-origin[]
 endif::only-pxe[]
 ifndef::only-pxe,openshift-origin[]
-** For PXE (with UEFI and Grub as second stage) on `arm64`:
+** For PXE (with UEFI and Grub as second stage) on `aarch64`:
 +
 ----
 menuentry 'Install CoreOS' {
diff --git a/modules/installation-user-infra-machines-static-network.adoc b/modules/installation-user-infra-machines-static-network.adoc
@@ -410,7 +410,7 @@ a|`--insecure-ignition`
 a|Allow Ignition URL without HTTPS or hash.
 
 a|`--architecture <name>`
-a|Target CPU architecture. Valid values are `x86_64` and `arm64`.
+a|Target CPU architecture. Valid values are `x86_64` and `aarch64`.
 
 a|`--preserve-on-error`
 a|Do not clear partition table on error.
diff --git a/modules/investigating-kernel-crashes.adoc b/modules/investigating-kernel-crashes.adoc
@@ -22,7 +22,7 @@ a|
 | GA
 
 a|
-`arm64`
+`aarch64`
 | TP
 
 a|
diff --git a/modules/ipi-install-node-requirements.adoc b/modules/ipi-install-node-requirements.adoc
@@ -10,7 +10,7 @@ Installer-provisioned installation involves a number of hardware node requiremen
 
 * *CPU architecture:* All nodes must use `x86_64` 
 ifndef::openshift-origin[]
-or `arm64` 
+or `aarch64` 
 endif::openshift-origin[]
 CPU architecture.
 * *Similar nodes:* Red Hat recommends nodes have an identical configuration per role. That is, Red Hat recommends nodes be the same brand and model with the same CPU, memory, and storage configuration.
diff --git a/modules/multi-architecture-creating-arm64-bootimage.adoc b/modules/multi-architecture-creating-arm64-bootimage.adoc
@@ -5,9 +5,9 @@
 :_content-type: PROCEDURE
 [id="multi-architecture-creating-arm64-bootimage_{context}"]
 
-= Creating an arm64 boot image using the Azure image gallery
+= Creating an ARM64 boot image using the Azure image gallery
  
-The following procedure describes how to manually generate an `arm64` boot image. 
+The following procedure describes how to manually generate an ARM64 boot image. 
  
 .Prerequisites
 
@@ -37,7 +37,7 @@ $ az storage account create -n ${STORAGE_ACCOUNT_NAME} -g ${RESOURCE_GROUP} -l w
 ----
 $ az storage container create -n ${CONTAINER_NAME} --account-name ${STORAGE_ACCOUNT_NAME}
 ----
-. You must use the {product-title} installation program JSON file to extract the URL and `arch64` VHD name:
+. You must use the {product-title} installation program JSON file to extract the URL and `aarch64` VHD name:
 .. Extract the `URL` field and set it to `RHCOS_VHD_ORIGIN_URL` as the file name by running the following command:
 +
 [source,terminal]
diff --git a/modules/multi-architecture-modify-machine-set.adoc b/modules/multi-architecture-modify-machine-set.adoc
@@ -5,9 +5,9 @@
 :_content-type: PROCEDURE
 [id="multi-architecture-modify-machine-set_{context}"]
 
-= Adding a multi-architecture compute machine set to your cluster using the arm64 boot image  
+= Adding a multi-architecture compute machine set to your cluster  
 
-To add `arm64` compute nodes to your cluster, you must create an Azure compute machine set that uses the `arm64` boot image. To create your own custom compute machine set on Azure, see "Creating a compute machine set on Azure". 
+To add ARM64 compute nodes to your cluster, you must create an Azure compute machine set that uses the ARM64 boot image. To create your own custom compute machine set on Azure, see "Creating a compute machine set on Azure". 
 
 .Prerequisites 
 
diff --git a/modules/op-installing-tkn-on-linux-using-rpm.adoc b/modules/op-installing-tkn-on-linux-using-rpm.adoc
@@ -68,7 +68,7 @@ For {op-system-base-full} version 8, you can install the {pipelines-title} CLI a
 # subscription-manager repos --enable="pipelines-1.10-for-rhel-8-ppc64le-rpms"
 ----
 +
-* Linux on ARM (arm64)
+* Linux on ARM (aarch64, arm64)
 +
 [source,terminal]
 ----
diff --git a/modules/op-installing-tkn-on-linux.adoc b/modules/op-installing-tkn-on-linux.adoc
@@ -20,7 +20,7 @@ For Linux distributions, you can download the CLI as a `tar.gz` archive.
 
 * link:https://mirror.openshift.com/pub/openshift-v4/clients/pipeline/1.10.0/tkn-linux-ppc64le.tar.gz[Linux on {ibmpowerProductName} (ppc64le)]
 
-* link:https://mirror.openshift.com/pub/openshift-v4/clients/pipeline/1.10.0/tkn-linux-arm64.tar.gz[Linux on ARM (arm64)]
+* link:https://mirror.openshift.com/pub/openshift-v4/clients/pipeline/1.10.0/tkn-linux-arm64.tar.gz[Linux on ARM (aarch64, arm64)]
 
 // Binaries also need to be updated in the following modules:
 // op-installing-pipelines-as-code-cli.adoc
diff --git a/post_installation_configuration/multi-architecture-configuration.adoc b/post_installation_configuration/multi-architecture-configuration.adoc
@@ -6,7 +6,7 @@ include::_attributes/common-attributes.adoc[]
 
 toc::[]
 
-An {product-title} cluster with multi-architecture compute machines is a cluster that supports compute machines with different architectures. Clusters with multi-architecture compute machines are available only on AWS or Azure installer-provisioned infrastructures and bare metal user-provisioned infrastructures with `x86_64` control plane machines.
+An {product-title} cluster with multi-architecture compute machines is a cluster that supports compute machines with different architectures. Clusters with multi-architecture compute machines are available only on AWS or Azure installer-provisioned infrastructures and bare metal user-provisioned infrastructures with x86_64 control plane machines.
 
 [NOTE]
 ====
@@ -28,9 +28,9 @@ include::modules/multi-architecture-verifying-cluster-compatibility.adoc[levelof
 
 == Creating a cluster with multi-architecture compute machine on Azure 
 
-To deploy an Azure cluster with multi-architecture compute machines, you must first create a single-architecture Azure installer-provisioned cluster that uses the multi-architecture installer binary. For more information on Azure installations, see xref:../installing/installing_azure/installing-azure-customizations.adoc[Installing a cluster on Azure with customizations]. You can then add an `arm64` compute machine set to your cluster to create a cluster with multi-architecture compute machines. 
+To deploy an Azure cluster with multi-architecture compute machines, you must first create a single-architecture Azure installer-provisioned cluster that uses the multi-architecture installer binary. For more information on Azure installations, see xref:../installing/installing_azure/installing-azure-customizations.adoc[Installing a cluster on Azure with customizations]. You can then add an ARM64 compute machine set to your cluster to create a cluster with multi-architecture compute machines. 
 
-The following procedures explain how to generate an `arm64` boot image and create an Azure compute machine set that uses the `arm64` boot image. This adds `arm64` compute nodes to your cluster and deploys the amount of `arm64` virtual machines (VM) that you need. 
+The following procedures explain how to generate an ARM64 boot image and create an Azure compute machine set that uses the ARM64 boot image. This adds ARM64 compute nodes to your cluster and deploys the amount of ARM64 virtual machines (VM) that you need. 
 
 include::modules/multi-architecture-creating-arm64-bootimage.adoc[leveloffset=+2]
 

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ Component EFI`
`41`	`41`	`----`
`42`	`42`	`ifndef::openshift-origin[]`
`43`	`43`	`+`
`44`		-.Example output for `arm64`
	`44`	+.Example output for `aarch64`
`45`	`45`	`[source, terminal]`
`46`	`46`	`----`
`47`	`47`	`Component EFI`