Skip to content

Commit bc78263

Browse files
mburke5678mburke5678
authored
Merge pull request #52785 from kelbrown20/OSDOCS-4502-change-to-multi-architecture
OSDOCS-4557: Changing heterogeneous to multi-architecture
2 parents 40be34d + f6cbf37 commit bc78263

6 files changed

+50
-21
lines changed

‎_topic_maps/_topic_map.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,8 +508,8 @@ Topics:
508508
File: configuring-private-cluster
509509
- Name: Bare metal configuration
510510
File: bare-metal-configuration
511-
- Name: Configuring a heterogeneous cluster
512-
File: deploy-heterogeneous-configuration
511+
- Name: Configuring a multi-architecture cluster
512+
File: multi-architecture-configuration
513513
- Name: Machine configuration tasks
514514
File: machine-configuration-tasks
515515
- Name: Cluster tasks

‎modules/mixed-arch-creating-arm64-bootimage.adoc renamed to ‎modules/multi-architecture-creating-arm64-bootimage.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
//post_installation_configuration/cluster-tasks.adoc
44

55
:_content-type: PROCEDURE
6-
[id="mixed-arch-creating-arm64-bootimage_{context}"]
6+
[id="multi-architecture-creating-arm64-bootimage_{context}"]
77

88
= Creating an `arm64` boot image using the Azure image gallery
99

10-
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.
10+
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.
1111

1212
.Prerequisites
1313

1414
* You installed the Azure CLI (`az`).
15-
* You created a single-architecture Azure installer-provisioned cluster with the heterogeneous installer binary.
15+
* You created a single-architecture Azure installer-provisioned cluster with the multi-architecture installer binary.
1616

1717
.Procedure
1818
. Log in to your Azure account:

‎modules/mixed-arch-modify-machine-set.adoc renamed to ‎modules/multi-architecture-modify-machine-set.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
//post_installation_configuration/cluster-tasks.adoc
44

55
:_content-type: PROCEDURE
6-
[id="mixed-arch-modify-machine-set_{context}"]
6+
[id="multi-architecture-modify-machine-set_{context}"]
77

88
= Adding a compute machine set to your cluster using the `arm64` boot image
99

10-
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".
10+
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".
1111

1212
.Prerequisites
1313

‎modules/mixed-arch-upgrade-mirrors.adoc renamed to ‎modules/multi-architecture-upgrade-mirrors.adoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
//post_installation_configuration/cluster-tasks.adoc
44

55
:_content-type: PROCEDURE
6-
[id="mixed-arch-upgrade-mirrors_{context}"]
6+
[id="multi-architecture-upgrade-mirrors_{context}"]
77

8-
= Upgrading your heterogeneous cluster
8+
= Upgrading your multi-architecture cluster
99

10-
You must perform an explicit upgrade command to upgrade your existing cluster to a heterogeneous cluster.
10+
You must perform an explicit upgrade command to upgrade your existing cluster to a multi-architecture cluster.
1111

1212
.Prerequisites
1313

@@ -16,6 +16,7 @@ You must perform an explicit upgrade command to upgrade your existing cluster to
1616
.Procedure
1717
* To manually upgrade your cluster, use the following command:
1818
[source, terminal]
19+
+
1920
----
2021
$ oc adm upgrade --allow-explicit-upgrade --to-image <image-pullspec> <1>
2122
----

‎post_installation_configuration/deploy-heterogeneous-configuration.adoc

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
:_content-type: ASSEMBLY
2-
:context: deploy-heterogeneous-configuration
3-
[id="post-install-deploy-heterogeneous-configuration"]
4-
= Configuring a heterogeneous cluster
2+
:context: multi-architecture-configuration
3+
[id="post-install-multi-architecture-configuration"]
4+
= Configuring a multi-architecture cluster
55
include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
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].
9+
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].
1010

1111
[WARNING]
1212
====
13-
The heterogeneous clusters Technology Preview feature has limited usability with installing, upgrading, and running payloads.
13+
The multi-architecture clusters Technology Preview feature has limited usability with installing, upgrading, and running payloads.
1414
====
1515

16-
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.
16+
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.
1717

18-
:FeatureName: Heterogeneous clusters for {product-title} on Azure installer-provisioned infrastructure installations
18+
:FeatureName: Multi-architecture clusters for {product-title} on Azure installer-provisioned infrastructure installations
1919
include::snippets/technology-preview.adoc[leveloffset=+1]
2020

21-
include::modules/mixed-arch-creating-arm64-bootimage.adoc[leveloffset=+1]
21+
include::modules/multi-architecture-creating-arm64-bootimage.adoc[leveloffset=+1]
2222

23-
include::modules/mixed-arch-modify-machine-set.adoc[leveloffset=+1]
23+
include::modules/multi-architecture-modify-machine-set.adoc[leveloffset=+1]
2424

2525
[role="_additional-resources"]
2626
.Additional resources
2727
* xref:../machine_management/creating_machinesets/creating-machineset-azure.adoc[Creating a compute machine set on Azure]
28-
29-
include::modules/mixed-arch-upgrade-mirrors.adoc[leveloffset=+1]
28+
include::modules/multi-architecture-upgrade-mirrors.adoc[leveloffset=+1]
3029
3130
include::modules/multi-architecture-import-imagestreams.adoc[leveloffset=+1]

‎post_installation_configuration/multi-architecture-configuration.adoc

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
:_content-type: ASSEMBLY
2+
:context: multi-architecture-configuration
3+
[id="post-install-multi-architecture-configuration"]
4+
= Configuring a multi-architecture cluster
5+
include::_attributes/common-attributes.adoc[]
6+
7+
toc::[]
8+
9+
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].
10+
11+
[WARNING]
12+
====
13+
The multi-architecture clusters Technology Preview feature has limited usability with installing, upgrading, and running payloads.
14+
====
15+
16+
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.
17+
18+
:FeatureName: Multi-architecture clusters for {product-title} on Azure installer-provisioned infrastructure installations
19+
include::snippets/technology-preview.adoc[leveloffset=+1]
20+
21+
include::modules/multi-architecture-creating-arm64-bootimage.adoc[leveloffset=+1]
22+
23+
include::modules/multi-architecture-modify-machine-set.adoc[leveloffset=+1]
24+
25+
[role="_additional-resources"]
26+
.Additional resources
27+
* xref:../machine_management/creating_machinesets/creating-machineset-azure.adoc[Creating a compute machine set on Azure]
28+
29+
include::modules/multi-architecture-upgrade-mirrors.adoc[leveloffset=+1]

0 commit comments

Comments
 (0)