diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index 76a54dfde3..656ecf7923 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -508,8 +508,8 @@ Topics: File: configuring-private-cluster - Name: Bare metal configuration File: bare-metal-configuration -- Name: Configuring a heterogeneous cluster - File: deploy-heterogeneous-configuration +- Name: Configuring a multi-architecture cluster + File: multi-architecture-configuration - Name: Machine configuration tasks File: machine-configuration-tasks - Name: Cluster tasks diff --git a/modules/mixed-arch-creating-arm64-bootimage.adoc b/modules/multi-architecture-creating-arm64-bootimage.adoc similarity index 93% rename from modules/mixed-arch-creating-arm64-bootimage.adoc rename to modules/multi-architecture-creating-arm64-bootimage.adoc index cf62910afe..d9e8efeadf 100644 --- a/modules/mixed-arch-creating-arm64-bootimage.adoc +++ b/modules/multi-architecture-creating-arm64-bootimage.adoc @@ -3,16 +3,16 @@ //post_installation_configuration/cluster-tasks.adoc :_content-type: PROCEDURE -[id="mixed-arch-creating-arm64-bootimage_{context}"] +[id="multi-architecture-creating-arm64-bootimage_{context}"] = Creating an `arm64` boot image using the Azure image gallery -To configure your heterogeneous cluster, you must create an `arm64` boot image and add it to your Azure compute machine set. The following procedure describes how to manually generate an `arm64` boot image. +To configure your multi-architecture cluster, you must create an `arm64` boot image and add it to your Azure compute machine set. The following procedure describes how to manually generate an `arm64` boot image. .Prerequisites * You installed the Azure CLI (`az`). -* You created a single-architecture Azure installer-provisioned cluster with the heterogeneous installer binary. +* You created a single-architecture Azure installer-provisioned cluster with the multi-architecture installer binary. .Procedure . Log in to your Azure account: diff --git a/modules/mixed-arch-modify-machine-set.adoc b/modules/multi-architecture-modify-machine-set.adoc similarity index 92% rename from modules/mixed-arch-modify-machine-set.adoc rename to modules/multi-architecture-modify-machine-set.adoc index b6ce2abb50..9012ae158c 100644 --- a/modules/mixed-arch-modify-machine-set.adoc +++ b/modules/multi-architecture-modify-machine-set.adoc @@ -3,11 +3,11 @@ //post_installation_configuration/cluster-tasks.adoc :_content-type: PROCEDURE -[id="mixed-arch-modify-machine-set_{context}"] +[id="multi-architecture-modify-machine-set_{context}"] = Adding a compute machine set to your cluster using the `arm64` boot image -To add `arm64` worker nodes to your heterogeneous 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` worker nodes to your multi-architecture 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/mixed-arch-upgrade-mirrors.adoc b/modules/multi-architecture-upgrade-mirrors.adoc similarity index 80% rename from modules/mixed-arch-upgrade-mirrors.adoc rename to modules/multi-architecture-upgrade-mirrors.adoc index ed8cc9dac4..5914bda5cb 100644 --- a/modules/mixed-arch-upgrade-mirrors.adoc +++ b/modules/multi-architecture-upgrade-mirrors.adoc @@ -3,11 +3,11 @@ //post_installation_configuration/cluster-tasks.adoc :_content-type: PROCEDURE -[id="mixed-arch-upgrade-mirrors_{context}"] +[id="multi-architecture-upgrade-mirrors_{context}"] -= Upgrading your heterogeneous cluster += Upgrading your multi-architecture cluster -You must perform an explicit upgrade command to upgrade your existing cluster to a heterogeneous cluster. +You must perform an explicit upgrade command to upgrade your existing cluster to a multi-architecture cluster. .Prerequisites @@ -16,6 +16,7 @@ You must perform an explicit upgrade command to upgrade your existing cluster to .Procedure * To manually upgrade your cluster, use the following command: [source, terminal] ++ ---- $ oc adm upgrade --allow-explicit-upgrade --to-image <1> ---- diff --git a/post_installation_configuration/deploy-heterogeneous-configuration.adoc b/post_installation_configuration/deploy-heterogeneous-configuration.adoc index a5e6de9dc9..116c491b7b 100644 --- a/post_installation_configuration/deploy-heterogeneous-configuration.adoc +++ b/post_installation_configuration/deploy-heterogeneous-configuration.adoc @@ -1,31 +1,30 @@ :_content-type: ASSEMBLY -:context: deploy-heterogeneous-configuration -[id="post-install-deploy-heterogeneous-configuration"] -= Configuring a heterogeneous cluster +:context: multi-architecture-configuration +[id="post-install-multi-architecture-configuration"] += Configuring a multi-architecture cluster include::_attributes/common-attributes.adoc[] toc::[] -A heterogeneous cluster is a cluster that supports worker machines with different architectures. You can deploy a heterogeneous cluster by creating an Azure installer-provisioned cluster using the heterogeneous installer binary. For Azure installation, see xref:../installing/installing_azure/installing-azure-customizations.adoc[Installing on Azure with customizations]. +A multi-architecture cluster is a cluster that supports worker machines with different architectures. You can deploy a multi-architecture cluster by creating an Azure installer-provisioned cluster using the multi-architecture installer binary. For Azure installation, see xref:../installing/installing_azure/installing-azure-customizations.adoc[Installing on Azure with customizations]. [WARNING] ==== -The heterogeneous clusters Technology Preview feature has limited usability with installing, upgrading, and running payloads. +The multi-architecture clusters Technology Preview feature has limited usability with installing, upgrading, and running payloads. ==== -The following procedures explain how to generate an `arm64` boot image and create an Azure compute machine set with the `arm64` boot image. This will add `arm64` worker nodes to your heterogeneous cluster and deploy the desired amount of ARM64 virtual machines (VM). This section also shows how to upgrade your existing cluster to a heterogeneous cluster. Heterogeneous clusters are only available on Azure installer-provisioned infrastructures with `x86_64` control planes. +The following procedures explain how to generate an `arm64` boot image and create an Azure compute machine set with the `arm64` boot image. This will add `arm64` worker nodes to your multi-architecture cluster and deploy the desired amount of ARM64 virtual machines (VM). This section also shows how to upgrade your existing cluster to a multi-architecture cluster. Multi-architecture clusters are only available on Azure installer-provisioned infrastructures with `x86_64` control planes. -:FeatureName: Heterogeneous clusters for {product-title} on Azure installer-provisioned infrastructure installations +:FeatureName: Multi-architecture clusters for {product-title} on Azure installer-provisioned infrastructure installations include::snippets/technology-preview.adoc[leveloffset=+1] -include::modules/mixed-arch-creating-arm64-bootimage.adoc[leveloffset=+1] +include::modules/multi-architecture-creating-arm64-bootimage.adoc[leveloffset=+1] -include::modules/mixed-arch-modify-machine-set.adoc[leveloffset=+1] +include::modules/multi-architecture-modify-machine-set.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources * xref:../machine_management/creating_machinesets/creating-machineset-azure.adoc[Creating a compute machine set on Azure] - -include::modules/mixed-arch-upgrade-mirrors.adoc[leveloffset=+1] +include::modules/multi-architecture-upgrade-mirrors.adoc[leveloffset=+1] include::modules/multi-architecture-import-imagestreams.adoc[leveloffset=+1] \ No newline at end of file diff --git a/post_installation_configuration/multi-architecture-configuration.adoc b/post_installation_configuration/multi-architecture-configuration.adoc new file mode 100644 index 0000000000..2a8b583e56 --- /dev/null +++ b/post_installation_configuration/multi-architecture-configuration.adoc @@ -0,0 +1,29 @@ +:_content-type: ASSEMBLY +:context: multi-architecture-configuration +[id="post-install-multi-architecture-configuration"] += Configuring a multi-architecture cluster +include::_attributes/common-attributes.adoc[] + +toc::[] + +A multi-architecture cluster is a cluster that supports worker machines with different architectures. You can deploy a multi-architecture cluster by creating an Azure installer-provisioned cluster using the multi-architecture installer binary. For Azure installation, see xref:../installing/installing_azure/installing-azure-customizations.adoc[Installing a cluster on Azure with customizations]. + +[WARNING] +==== +The multi-architecture clusters Technology Preview feature has limited usability with installing, upgrading, and running payloads. +==== + +The following procedures explain how to generate an `arm64` boot image and create an Azure compute machine set with the `arm64` boot image. This will add `arm64` worker nodes to your multi-architecture cluster and deploy the desired amount of ARM64 virtual machines (VM). This section also shows how to upgrade your existing cluster to a multi-architecture cluster. Multi-architecture clusters are only available on Azure installer-provisioned infrastructures with `x86_64` control planes. + +:FeatureName: Multi-architecture clusters for {product-title} on Azure installer-provisioned infrastructure installations +include::snippets/technology-preview.adoc[leveloffset=+1] + +include::modules/multi-architecture-creating-arm64-bootimage.adoc[leveloffset=+1] + +include::modules/multi-architecture-modify-machine-set.adoc[leveloffset=+1] + +[role="_additional-resources"] +.Additional resources +* xref:../machine_management/creating_machinesets/creating-machineset-azure.adoc[Creating a compute machine set on Azure] + +include::modules/multi-architecture-upgrade-mirrors.adoc[leveloffset=+1] \ No newline at end of file