From ba4cc7ee3ad9cf3e552e33767c512875f3e8eb63 Mon Sep 17 00:00:00 2001 From: Kelly Brown Date: Mon, 13 Feb 2023 15:34:55 -0500 Subject: [PATCH] OSDOCS-5058: Azure UPI support on ARM --- installing/installing-preparing.adoc | 6 +++++- .../installing_azure/installing-azure-user-infra.adoc | 1 + modules/installation-azure-user-infra-deploying-rhcos.adoc | 6 +++++- modules/installation-azure-user-infra-uploading-rhcos.adoc | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/installing/installing-preparing.adoc b/installing/installing-preparing.adoc index 6b338770fef8..c8ac01fe9647 100644 --- a/installing/installing-preparing.adoc +++ b/installing/installing-preparing.adoc @@ -459,13 +459,14 @@ endif::openshift-origin[] //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. ifndef::openshift-origin[] |=== -||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 +||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 |Custom | |xref:../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[✓] |xref:../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[✓] |xref:../installing/installing_azure/installing-azure-user-infra.adoc#installing-azure-user-infra[✓] +|xref:../installing/installing_azure/installing-azure-user-infra.adoc#installing-azure-user-infra[✓] |xref:../installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[✓] |xref:../installing/installing_gcp/installing-gcp-user-infra.adoc#installing-gcp-user-infra[✓] | @@ -492,6 +493,7 @@ ifndef::openshift-origin[] | | | +| |xref:../installing/installing_openstack/installing-openstack-user-kuryr.adoc#installing-openstack-user-kuryr[✓] | |xref:../installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc#installing-bare-metal-network-customizations[✓] @@ -510,6 +512,7 @@ ifndef::openshift-origin[] |xref:../installing/installing_aws/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[✓] | | +| |xref:../installing/installing_gcp/installing-restricted-networks-gcp.adoc#installing-restricted-networks-gcp[✓] | | @@ -530,6 +533,7 @@ ifndef::openshift-origin[] | | | +| |xref:../installing/installing_gcp/installing-gcp-user-infra-vpc.adoc#installing-gcp-user-infra-vpc[✓] | | diff --git a/installing/installing_azure/installing-azure-user-infra.adoc b/installing/installing_azure/installing-azure-user-infra.adoc index 2800e370bd52..eaab9638c4e6 100644 --- a/installing/installing_azure/installing-azure-user-infra.adoc +++ b/installing/installing_azure/installing-azure-user-infra.adoc @@ -72,6 +72,7 @@ This section describes the requirements for deploying {product-title} on user-pr include::modules/installation-machine-requirements.adoc[leveloffset=+2] include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2] include::modules/installation-azure-tested-machine-types.adoc[leveloffset=+2] +include::modules/installation-azure-arm-tested-machine-types.adoc[leveloffset=+2] include::modules/installation-azure-marketplace-subscribe.adoc[leveloffset=+1] diff --git a/modules/installation-azure-user-infra-deploying-rhcos.adoc b/modules/installation-azure-user-infra-deploying-rhcos.adoc index 4c3681415274..7dcb6ecc7f7a 100644 --- a/modules/installation-azure-user-infra-deploying-rhcos.adoc +++ b/modules/installation-azure-user-infra-deploying-rhcos.adoc @@ -49,10 +49,14 @@ $ export VHD_BLOB_URL=`az storage blob url --account-name ${CLUSTER_NAME}sa --ac $ az deployment group create -g ${RESOURCE_GROUP} \ --template-file "/02_storage.json" \ --parameters vhdBlobURL="${VHD_BLOB_URL}" \ <1> - --parameters baseName="${INFRA_ID}"<2> + --parameters baseName="${INFRA_ID}" \ <2> + --parameters storageAccount="${CLUSTER_NAME}sa" \ <3> + --parameters architecture="" <4> ---- <1> The blob URL of the {op-system} VHD to be used to create master and worker machines. <2> The base name to be used in resource names; this is usually the cluster's infrastructure ID. +<3> The name of your Azure storage account. +<4> Specify the system architecture. Valid values are `x64` (default) or `Arm64`. ifeval::["{context}" == "installing-azure-user-infra"] :!azure: diff --git a/modules/installation-azure-user-infra-uploading-rhcos.adoc b/modules/installation-azure-user-infra-uploading-rhcos.adoc index fcd498807fe1..b244c84d2f99 100644 --- a/modules/installation-azure-user-infra-uploading-rhcos.adoc +++ b/modules/installation-azure-user-infra-uploading-rhcos.adoc @@ -74,7 +74,7 @@ $ export ACCOUNT_KEY=`az storage account keys list -g ${RESOURCE_GROUP} --accoun ifdef::azure[] [source,terminal] ---- -$ export VHD_URL=`openshift-install coreos print-stream-json | jq -r '.architectures.x86_64."rhel-coreos-extensions"."azure-disk".url'` +$ export VHD_URL=`openshift-install coreos print-stream-json | jq -r '.architectures.."rhel-coreos-extensions"."azure-disk".url'` ---- endif::azure[] ifdef::ash[]