Skip to content

Commit b901dd3

Browse files
authored
Merge pull request #53552 from kelbrown20/OSDOCS-4658-cluster-compute
OSDOCS-4658: Cluster to compute machines
2 parents eef7237 + a161255 commit b901dd3

6 files changed

+17
-15
lines changed

_topic_maps/_topic_map.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ Topics:
513513
File: configuring-private-cluster
514514
- Name: Bare metal configuration
515515
File: bare-metal-configuration
516-
- Name: Configuring a multi-architecture cluster
516+
- Name: Configuring multi-architecture compute machines on an OpenShift cluster
517517
File: multi-architecture-configuration
518518
- Name: Machine configuration tasks
519519
File: machine-configuration-tasks

modules/multi-architecture-creating-arm64-bootimage.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
:_content-type: PROCEDURE
66
[id="multi-architecture-creating-arm64-bootimage_{context}"]
77

8-
= Creating an `arm64` boot image using the Azure image gallery
8+
= Creating an arm64 boot image using the Azure image gallery
99

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.
10+
To configure your cluster with multi-architecture compute machines, 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

modules/multi-architecture-import-imagestreams.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
:_content-type: PROCEDURE
66
[id="multi-architecture-import-imagestreams_{context}"]
77

8-
= Importing manifest lists in image streams on your multi-architecture cluster
8+
= Importing manifest lists in image streams on your multi-architecture compute machines
99

10-
On a {product-title} {product-version} multi-architecture cluster, the image streams in the cluster do not import manifest lists automatically. You must manually change the default `importMode` option to the `PreserveOriginal` option in order to import the manifest list.
10+
On an {product-title} {product-version} cluster with multi-architecture compute machines, the image streams in the cluster do not import manifest lists automatically. You must manually change the default `importMode` option to the `PreserveOriginal` option in order to import the manifest list.
1111

1212
[IMPORTANT]
1313
====

modules/multi-architecture-modify-machine-set.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
:_content-type: PROCEDURE
66
[id="multi-architecture-modify-machine-set_{context}"]
77

8-
= Adding a compute machine set to your cluster using the `arm64` boot image
8+
= Adding a multi-architecture compute machine set to your cluster using the arm64 boot image
99

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

1212
.Prerequisites
1313

modules/multi-architecture-upgrade-mirrors.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
:_content-type: PROCEDURE
66
[id="multi-architecture-upgrade-mirrors_{context}"]
77

8-
= Upgrading your multi-architecture cluster
8+
= Upgrading a cluster with multi-architecture compute machines
99

10-
You must perform an explicit upgrade command to upgrade your existing cluster to a multi-architecture cluster.
10+
You must perform an explicit upgrade command to upgrade your existing cluster to a cluster that supports multi-architecture compute machines.
1111

1212
.Prerequisites
1313

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
:_content-type: ASSEMBLY
22
:context: multi-architecture-configuration
33
[id="post-install-multi-architecture-configuration"]
4-
= Configuring a multi-architecture cluster
4+
= Configuring multi-architecture compute machines on an {product-title} cluster
55
include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

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].
9+
An {product-title} cluster with multi-architecture compute machines is a cluster that supports compute machines with different architectures. You can deploy a cluster with multi-architecture compute machines 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].
1010

1111
[WARNING]
1212
====
13-
The multi-architecture clusters Technology Preview feature has limited usability with installing, upgrading, and running payloads.
13+
The multi-architecture compute machines 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 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.
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 adds `arm64` compute nodes to your cluster and deploys the desired amount of `arm64` virtual machines (VM). This section also shows how to upgrade your existing cluster to a cluster that supports multi-architecture compute machines. Clusters with multi-architecture compute machines are only available on Azure installer-provisioned infrastructures with `x86_64` control plane machines.
1717

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

2121
include::modules/multi-architecture-creating-arm64-bootimage.adoc[leveloffset=+1]
@@ -26,4 +26,6 @@ include::modules/multi-architecture-modify-machine-set.adoc[leveloffset=+1]
2626
.Additional resources
2727
* xref:../machine_management/creating_machinesets/creating-machineset-azure.adoc[Creating a compute machine set on Azure]
2828
29-
include::modules/multi-architecture-upgrade-mirrors.adoc[leveloffset=+1]
29+
include::modules/multi-architecture-upgrade-mirrors.adoc[leveloffset=+1]
30+
31+
include::modules/multi-architecture-import-imagestreams.adoc[leveloffset=+1]

0 commit comments

Comments
 (0)