Skip to content

Commit 39a43fe

Browse files
authored
Merge pull request #55861 from kelbrown20/OSDOCS-5058-Azure-UPI-support-on-ARM
OSDOCS-5058: Azure UPI support on 64-bit ARM systems
2 parents 854f778 + 4cf3109 commit 39a43fe

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

installing/installing-preparing.adoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,13 +459,14 @@ endif::openshift-origin[]
459459
//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.
460460
ifndef::openshift-origin[]
461461
|===
462-
||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 |{ibmzProductName} |{ibmzProductName} with {op-system-base} KVM |{ibmpowerProductName} |Platform agnostic
462+
||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
463463

464464
|Custom
465465
|
466466
|xref:../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[✓]
467467
|xref:../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[✓]
468468
|xref:../installing/installing_azure/installing-azure-user-infra.adoc#installing-azure-user-infra[✓]
469+
|xref:../installing/installing_azure/installing-azure-user-infra.adoc#installing-azure-user-infra[✓]
469470
|xref:../installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[✓]
470471
|xref:../installing/installing_gcp/installing-gcp-user-infra.adoc#installing-gcp-user-infra[✓]
471472
|
@@ -492,6 +493,7 @@ ifndef::openshift-origin[]
492493
|
493494
|
494495
|
496+
|
495497
|xref:../installing/installing_openstack/installing-openstack-user-kuryr.adoc#installing-openstack-user-kuryr[✓]
496498
|
497499
|xref:../installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc#installing-bare-metal-network-customizations[✓]
@@ -510,6 +512,7 @@ ifndef::openshift-origin[]
510512
|xref:../installing/installing_aws/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[✓]
511513
|
512514
|
515+
|
513516
|xref:../installing/installing_gcp/installing-restricted-networks-gcp.adoc#installing-restricted-networks-gcp[✓]
514517
|
515518
|
@@ -530,6 +533,7 @@ ifndef::openshift-origin[]
530533
|
531534
|
532535
|
536+
|
533537
|xref:../installing/installing_gcp/installing-gcp-user-infra-vpc.adoc#installing-gcp-user-infra-vpc[✓]
534538
|
535539
|

installing/installing_azure/installing-azure-user-infra.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ This section describes the requirements for deploying {product-title} on user-pr
7272
include::modules/installation-machine-requirements.adoc[leveloffset=+2]
7373
include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
7474
include::modules/installation-azure-tested-machine-types.adoc[leveloffset=+2]
75+
include::modules/installation-azure-arm-tested-machine-types.adoc[leveloffset=+2]
7576

7677
include::modules/installation-azure-marketplace-subscribe.adoc[leveloffset=+1]
7778

modules/installation-azure-user-infra-deploying-rhcos.adoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,14 @@ $ export VHD_BLOB_URL=`az storage blob url --account-name ${CLUSTER_NAME}sa --ac
4949
$ az deployment group create -g ${RESOURCE_GROUP} \
5050
--template-file "<installation_directory>/02_storage.json" \
5151
--parameters vhdBlobURL="${VHD_BLOB_URL}" \ <1>
52-
--parameters baseName="${INFRA_ID}"<2>
52+
--parameters baseName="${INFRA_ID}" \ <2>
53+
--parameters storageAccount="${CLUSTER_NAME}sa" \ <3>
54+
--parameters architecture="<architecture>" <4>
5355
----
5456
<1> The blob URL of the {op-system} VHD to be used to create master and worker machines.
5557
<2> The base name to be used in resource names; this is usually the cluster's infrastructure ID.
58+
<3> The name of your Azure storage account.
59+
<4> Specify the system architecture. Valid values are `x64` (default) or `Arm64`.
5660

5761
ifeval::["{context}" == "installing-azure-user-infra"]
5862
:!azure:

modules/installation-azure-user-infra-uploading-rhcos.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ $ export ACCOUNT_KEY=`az storage account keys list -g ${RESOURCE_GROUP} --accoun
7474
ifdef::azure[]
7575
[source,terminal]
7676
----
77-
$ export VHD_URL=`openshift-install coreos print-stream-json | jq -r '.architectures.x86_64."rhel-coreos-extensions"."azure-disk".url'`
77+
$ export VHD_URL=`openshift-install coreos print-stream-json | jq -r '.architectures.<architecture>."rhel-coreos-extensions"."azure-disk".url'`
7878
----
7979
endif::azure[]
8080
ifdef::ash[]

0 commit comments

Comments
 (0)