Skip to content

Commit 4d0656b

Browse files
committed
OSDOCS-3329: ARM suuport on Azure installations
1 parent 7fc8828 commit 4d0656b

9 files changed

+57
-24
lines changed

installing/installing-preparing.adoc

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ Before you install an {product-title} cluster, you need to select the best insta
1818
If you want to install and manage {product-title} yourself, you can install it on the following platforms:
1919

2020
* Alibaba Cloud
21-
* Amazon Web Services (AWS) on x86_64 instances
21+
* Amazon Web Services (AWS) on `x86_64` instances
2222
ifndef::openshift-origin[]
23-
* Amazon Web Services (AWS) on arm64 instances
23+
* Amazon Web Services (AWS) on `arm64` instances
2424
endif::openshift-origin[]
25-
* Microsoft Azure
25+
* Microsoft Azure on `x86_64` instances
26+
* Microsoft Azure on `arm64` instances
2627
* Microsoft Azure Stack Hub
2728
* Google Cloud Platform (GCP)
2829
* {rh-openstack-first}
@@ -127,13 +128,14 @@ Not all installation options are supported for all platforms, as shown in the fo
127128
//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.
128129
ifndef::openshift-origin[]
129130
|===
130-
||Alibaba |AWS (x86_64) |AWS (arm64) |Azure |Azure Stack Hub |GCP |Nutanix |{rh-openstack} |RHV |Bare metal (x86_64) |Bare metal (arm64) |vSphere |VMC |IBM Cloud VPC |IBM Z |IBM Power
131+
||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 |IBM Z |IBM Power
131132

132133
|Default
133134
|xref:../installing/installing_alibaba/installing-alibaba-default.adoc#installing-alibaba-default[✓]
134135
|xref:../installing/installing_aws/installing-aws-default.adoc#installing-aws-default[✓]
135136
|xref:../installing/installing_aws/installing-aws-default.adoc#installing-aws-default[✓]
136137
|xref:../installing/installing_azure/installing-azure-default.adoc#installing-azure-default[✓]
138+
|xref:../installing/installing_azure/installing-azure-default.adoc#installing-azure-default[✓]
137139
|xref:../installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc#installing-azure-stack-hub-default[✓]
138140
|xref:../installing/installing_gcp/installing-gcp-default.adoc#installing-gcp-default[✓]
139141
|xref:../installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc#installing-nutanix-installer-provisioned[✓]
@@ -152,6 +154,7 @@ ifndef::openshift-origin[]
152154
|xref:../installing/installing_aws/installing-aws-customizations.adoc#installing-aws-customizations[✓]
153155
|xref:../installing/installing_aws/installing-aws-customizations.adoc#installing-aws-customizations[✓]
154156
|xref:../installing/installing_azure/installing-azure-customizations.adoc#installing-azure-customizations[✓]
157+
|xref:../installing/installing_azure/installing-azure-customizations.adoc#installing-azure-customizations[✓]
155158
|xref:../installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc#installing-azure-stack-hub-default[✓]
156159
|xref:../installing/installing_gcp/installing-gcp-customizations.adoc#installing-gcp-customizations[✓]
157160
|xref:../installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc#installing-nutanix-installer-provisioned[✓]
@@ -171,6 +174,7 @@ ifndef::openshift-origin[]
171174
|xref:../installing/installing_aws/installing-aws-network-customizations.adoc#installing-aws-network-customizations[✓]
172175
|xref:../installing/installing_aws/installing-aws-network-customizations.adoc#installing-aws-network-customizations[✓]
173176
|xref:../installing/installing_azure/installing-azure-network-customizations.adoc#installing-azure-network-customizations[✓]
177+
|xref:../installing/installing_azure/installing-azure-network-customizations.adoc#installing-azure-network-customizations[✓]
174178
|xref:../installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc#installing-azure-stack-hub-network-customizations[✓]
175179
|xref:../installing/installing_gcp/installing-gcp-network-customizations.adoc#installing-gcp-network-customizations[✓]
176180
|
@@ -190,6 +194,7 @@ ifndef::openshift-origin[]
190194
|xref:../installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc#installing-restricted-networks-aws-installer-provisioned[✓]
191195
|
192196
|
197+
|
193198
|xref:../installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc#installing-restricted-networks-gcp-installer-provisioned[✓]
194199
|
195200
|xref:../installing/installing_openstack/installing-openstack-installer-restricted.adoc#installing-openstack-installer-restricted[✓]
@@ -207,6 +212,7 @@ ifndef::openshift-origin[]
207212
|xref:../installing/installing_aws/installing-aws-private.adoc#installing-aws-private[✓]
208213
|xref:../installing/installing_aws/installing-aws-private.adoc#installing-aws-private[✓]
209214
|xref:../installing/installing_azure/installing-azure-private.adoc#installing-azure-private[✓]
215+
|xref:../installing/installing_azure/installing-azure-private.adoc#installing-azure-private[✓]
210216
|
211217
|xref:../installing/installing_gcp/installing-gcp-private.adoc#installing-gcp-private[✓]
212218
|
@@ -225,6 +231,7 @@ ifndef::openshift-origin[]
225231
|xref:../installing/installing_aws/installing-aws-vpc.adoc#installing-aws-vpc[✓]
226232
|xref:../installing/installing_aws/installing-aws-vpc.adoc#installing-aws-vpc[✓]
227233
|xref:../installing/installing_azure/installing-azure-vnet.adoc#installing-azure-vnet[✓]
234+
|xref:../installing/installing_azure/installing-azure-vnet.adoc#installing-azure-vnet[✓]
228235
|
229236
|xref:../installing/installing_gcp/installing-gcp-vpc.adoc#installing-gcp-vpc[✓]
230237
|
@@ -243,6 +250,7 @@ ifndef::openshift-origin[]
243250
|xref:../installing/installing_aws/installing-aws-government-region.adoc#installing-aws-government-region[✓]
244251
|
245252
|xref:../installing/installing_azure/installing-azure-government-region.adoc#installing-azure-government-region[✓]
253+
|xref:../installing/installing_azure/installing-azure-government-region.adoc#installing-azure-government-region[✓]
246254
|
247255
|
248256
|
@@ -273,6 +281,7 @@ ifndef::openshift-origin[]
273281
|
274282
|
275283
|
284+
|
276285

277286
|China regions
278287
|
@@ -291,6 +300,7 @@ ifndef::openshift-origin[]
291300
|
292301
|
293302
|
303+
|
294304
|===
295305
endif::openshift-origin[]
296306

installing/installing_azure/installing-azure-customizations.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
3636

3737
include::modules/installation-azure-tested-machine-types.adoc[leveloffset=+2]
3838

39+
include::modules/installation-azure-arm-tested-machine-types.adoc[leveloffset=+2]
40+
3941
include::modules/installation-azure-config-yaml.adoc[leveloffset=+2]
4042

4143
include::modules/installation-configure-proxy.adoc[leveloffset=+2]

installing/installing_azure/installing-azure-government-region.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
4444

4545
include::modules/installation-azure-tested-machine-types.adoc[leveloffset=+2]
4646

47+
include::modules/installation-azure-arm-tested-machine-types.adoc[leveloffset=+2]
48+
4749
include::modules/installation-azure-config-yaml.adoc[leveloffset=+2]
4850

4951
include::modules/installation-configure-proxy.adoc[leveloffset=+2]

installing/installing_azure/installing-azure-network-customizations.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
3939

4040
include::modules/installation-azure-tested-machine-types.adoc[leveloffset=+2]
4141

42+
include::modules/installation-azure-arm-tested-machine-types.adoc[leveloffset=+2]
43+
4244
include::modules/installation-azure-config-yaml.adoc[leveloffset=+2]
4345

4446
include::modules/installation-configure-proxy.adoc[leveloffset=+2]

installing/installing_azure/installing-azure-private.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
3939

4040
include::modules/installation-azure-tested-machine-types.adoc[leveloffset=+2]
4141

42+
include::modules/installation-azure-arm-tested-machine-types.adoc[leveloffset=+2]
43+
4244
include::modules/installation-azure-config-yaml.adoc[leveloffset=+2]
4345

4446
include::modules/installation-configure-proxy.adoc[leveloffset=+2]

installing/installing_azure/installing-azure-vnet.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
3333

3434
include::modules/installation-azure-tested-machine-types.adoc[leveloffset=+2]
3535

36+
include::modules/installation-azure-arm-tested-machine-types.adoc[leveloffset=+2]
37+
3638
include::modules/installation-azure-config-yaml.adoc[leveloffset=+2]
3739

3840
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2+
// Module included in the following assemblies:
3+
//
4+
// installing/installing_azure/installing-azure-customizations.adoc
5+
// installing/installing_azure/installing-azure-government-region.adoc
6+
// installing/installing_azure/installing-azure-network-customizations.adoc
7+
// installing/installing_azure/installing-azure-private.adoc
8+
// installing/installing_azure/installing-azure-user-infra.adoc
9+
// installing/installing_azure/installing-azure-vnet.adoc
10+
11+
[id="installation-azure-arm-tested-machine-types_{context}"]
12+
= Tested instance types for Azure ARM
13+
14+
The following Microsoft Azure instance types have been tested with {product-title}.
15+
16+
.Machine types
17+
[%collapsible]
18+
====
19+
include::https://raw.githubusercontent.com/openshift/installer/master/docs/user/azure/tested_instance_types_aarch64.md[]
20+
====

modules/installation-azure-marketplace-subscribe.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ endif::mapi[]
3030
* While the images are the same, the Azure Marketplace publisher is different depending on your region. If you are located in North America, specify `redhat` as the publisher. If you are located in EMEA, specify `redhat-limited` as the publisher.
3131
* The offer includes a `rh-ocp-worker` SKU and a `rh-ocp-worker-gen1` SKU. The `rh-ocp-worker` SKU represents a Hyper-V generation version 2 VM image. The default instance types used in {product-title} are version 2 compatible. If you are going to use an instance type that is only version 1 compatible, use the image associated with the `rh-ocp-worker-gen1` SKU. The `rh-ocp-worker-gen1` SKU represents a Hyper-V version 1 VM image.
3232
33+
[IMPORTANT]
34+
====
35+
Installing images with the Azure marketplace is not supported on clusters with `arm64` instances.
36+
====
37+
3338
.Prerequisites
3439

3540
* You have installed the Azure CLI client `(az)`.

modules/installation-configuration-parameters.adoc

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -489,23 +489,17 @@ endif::rhv[]
489489

490490
ifndef::openshift-origin[]
491491

492-
ifndef::aws,bare,ibm-power,ibm-z[]
492+
ifndef::aws,bare,ibm-power,ibm-z,azure[]
493493
|`compute.architecture`
494494
|Determines the instruction set architecture of the machines in the pool. Currently, clusters with varied architectures are not supported. All pools must specify the same architecture. Valid values are `amd64` (the default).
495495
|String
496-
endif::aws,bare,ibm-power,ibm-z[]
496+
endif::aws,bare,ibm-power,ibm-z,azure[]
497497

498-
ifdef::aws[]
498+
ifdef::aws,bare,azure[]
499499
|`compute.architecture`
500500
|Determines the instruction set architecture of the machines in the pool. Currently, clusters with varied architectures are not supported. All pools must specify the same architecture. Valid values are `amd64` and `arm64`. See _Supported installation methods for different platforms_ in _Installing_ documentation for information about instance availability.
501501
|String
502-
endif::aws[]
503-
504-
ifdef::bare[]
505-
|`compute.architecture`
506-
|Determines the instruction set architecture of the machines in the pool. Currently, clusters with varied architectures are not supported. All pools must specify the same architecture. Valid values are `amd64` and `arm64`.
507-
|String
508-
endif::bare[]
502+
endif::aws,bare,azure[]
509503

510504
ifdef::ibm-z[]
511505
|`compute.architecture`
@@ -562,23 +556,17 @@ For details, see the "Additional RHV parameters for machine pools" table.
562556
endif::rhv[]
563557

564558
ifndef::openshift-origin[]
565-
ifndef::aws,bare,ibm-z,ibm-power[]
559+
ifndef::aws,bare,ibm-z,ibm-power,azure[]
566560
|`controlPlane.architecture`
567561
|Determines the instruction set architecture of the machines in the pool. Currently, clusters with varied architectures are not supported. All pools must specify the same architecture. Valid values are `amd64` (the default).
568562
|String
569-
endif::aws,bare,ibm-z,ibm-power[]
563+
endif::aws,bare,ibm-z,ibm-power,azure[]
570564

571-
ifdef::aws[]
565+
ifdef::aws,bare,azure[]
572566
|`controlPlane.architecture`
573567
|Determines the instruction set architecture of the machines in the pool. Currently, clusters with varied architectures are not supported. All pools must specify the same architecture. Valid values are `amd64` and `arm64`. See _Supported installation methods for different platforms_ in _Installing_ documentation for information about instance availability.
574568
|String
575-
endif::aws[]
576-
577-
ifdef::bare[]
578-
|`controlPlane.architecture`
579-
|Determines the instruction set architecture of the machines in the pool. Currently, clusters with varied architectures are not supported. All pools must specify the same architecture. Valid values are `amd64` and `arm64`.
580-
|String
581-
endif::bare[]
569+
endif::aws,bare,azure[]
582570

583571
ifdef::ibm-z[]
584572
|`controlPlane.architecture`

0 commit comments

Comments
 (0)