Merge pull request #42953 from mjpytlak/SupportMatrix

Bob Furu · web-flow · commit c6f845ef820a · 2022-03-08T08:00:47.000-05:00
diff --git a/installing/installing-preparing.adoc b/installing/installing-preparing.adoc
@@ -163,7 +163,7 @@ endif::openshift-origin[]
 |
 
 |Network customization
-|
+|xref:../installing/installing_alibaba/installing-alibaba-network-customizations.adoc#installing-alibaba-network-customizations[X]
 |xref:../installing/installing_aws/installing-aws-network-customizations.adoc#installing-aws-network-customizations[X]
 |xref:../installing/installing_aws/installing-aws-network-customizations.adoc#installing-aws-network-customizations[X]
 |xref:../installing/installing_azure/installing-azure-network-customizations.adoc#installing-azure-network-customizations[X]
@@ -268,14 +268,15 @@ endif::openshift-origin[]
 .User-provisioned infrastructure options
 |===
 ifndef::openshift-origin[]
-||AWS |Azure |Azure Stack Hub |GCP |{rh-openstack} |{rh-openstack} on SR-IOV |RHV |Bare metal (x86_64) |Bare metal (arm64) |vSphere |VMC |IBM Cloud |IBM Z |IBM Z with {op-system-base} KVM |IBM Power |Platform agnostic
+||Alibaba |AWS |Azure |Azure Stack Hub |GCP |{rh-openstack} |{rh-openstack} on SR-IOV |RHV |Bare metal (x86_64) |Bare metal (arm64) |vSphere |VMC |IBM Cloud |IBM Z |IBM Z with {op-system-base} KVM |IBM Power |Platform agnostic
 endif::openshift-origin[]
 ifdef::openshift-origin[]
-||AWS |Azure |Azure Stack Hub |GCP |{rh-openstack} |{rh-openstack} on SR-IOV |oVirt |Bare metal |vSphere |VMC |IBM Cloud |IBM Z |IBM Z with {op-system-base} KVM |IBM Power |Platform agnostic
+||Alibaba |AWS |Azure |Azure Stack Hub |GCP |{rh-openstack} |{rh-openstack} on SR-IOV |oVirt |Bare metal |vSphere |VMC |IBM Cloud |IBM Z |IBM Z with {op-system-base} KVM |IBM Power |Platform agnostic
 endif::openshift-origin[]
 
 
 |Custom
+|
 |xref:../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[X]
 |xref:../installing/installing_azure/installing-azure-user-infra.adoc#installing-azure-user-infra[X]
 |xref:../installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[X]
@@ -300,6 +301,7 @@ endif::openshift-origin[]
 |
 |
 |
+|
 |xref:../installing/installing_openstack/installing-openstack-user-kuryr.adoc#installing-openstack-user-kuryr[X]
 |
 |
@@ -314,6 +316,7 @@ endif::openshift-origin[]
 |
 
 |Restricted network
+|
 |xref:../installing/installing_aws/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[X]
 |
 |
@@ -335,6 +338,7 @@ endif::openshift-origin[]
 |
 |
 |
+|
 |xref:../installing/installing_gcp/installing-gcp-user-infra-vpc.adoc#installing-gcp-user-infra-vpc[X]
 |
 |

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ endif::openshift-origin[]`
`163`	`163`	`\|`
`164`	`164`
`165`	`165`	`\|Network customization`
`166`		`-\|`
	`166`	`+\|xref:../installing/installing_alibaba/installing-alibaba-network-customizations.adoc#installing-alibaba-network-customizations[X]`
`167`	`167`	`\|xref:../installing/installing_aws/installing-aws-network-customizations.adoc#installing-aws-network-customizations[X]`
`168`	`168`	`\|xref:../installing/installing_aws/installing-aws-network-customizations.adoc#installing-aws-network-customizations[X]`
`169`	`169`	`\|xref:../installing/installing_azure/installing-azure-network-customizations.adoc#installing-azure-network-customizations[X]`
`@@ -268,14 +268,15 @@ endif::openshift-origin[]`
`268`	`268`	`.User-provisioned infrastructure options`
`269`	`269`	`\|===`
`270`	`270`	`ifndef::openshift-origin[]`
`271`		`-\|\|AWS \|Azure \|Azure Stack Hub \|GCP \|{rh-openstack} \|{rh-openstack} on SR-IOV \|RHV \|Bare metal (x86_64) \|Bare metal (arm64) \|vSphere \|VMC \|IBM Cloud \|IBM Z \|IBM Z with {op-system-base} KVM \|IBM Power \|Platform agnostic`
	`271`	`+\|\|Alibaba \|AWS \|Azure \|Azure Stack Hub \|GCP \|{rh-openstack} \|{rh-openstack} on SR-IOV \|RHV \|Bare metal (x86_64) \|Bare metal (arm64) \|vSphere \|VMC \|IBM Cloud \|IBM Z \|IBM Z with {op-system-base} KVM \|IBM Power \|Platform agnostic`
`272`	`272`	`endif::openshift-origin[]`
`273`	`273`	`ifdef::openshift-origin[]`
`274`		`-\|\|AWS \|Azure \|Azure Stack Hub \|GCP \|{rh-openstack} \|{rh-openstack} on SR-IOV \|oVirt \|Bare metal \|vSphere \|VMC \|IBM Cloud \|IBM Z \|IBM Z with {op-system-base} KVM \|IBM Power \|Platform agnostic`
	`274`	`+\|\|Alibaba \|AWS \|Azure \|Azure Stack Hub \|GCP \|{rh-openstack} \|{rh-openstack} on SR-IOV \|oVirt \|Bare metal \|vSphere \|VMC \|IBM Cloud \|IBM Z \|IBM Z with {op-system-base} KVM \|IBM Power \|Platform agnostic`
`275`	`275`	`endif::openshift-origin[]`
`276`	`276`
`277`	`277`
`278`	`278`	`\|Custom`
	`279`	`+\|`
`279`	`280`	`\|xref:../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[X]`
`280`	`281`	`\|xref:../installing/installing_azure/installing-azure-user-infra.adoc#installing-azure-user-infra[X]`
`281`	`282`	`\|xref:../installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[X]`
`@@ -300,6 +301,7 @@ endif::openshift-origin[]`
`300`	`301`	`\|`
`301`	`302`	`\|`
`302`	`303`	`\|`
	`304`	`+\|`
`303`	`305`	`\|xref:../installing/installing_openstack/installing-openstack-user-kuryr.adoc#installing-openstack-user-kuryr[X]`
`304`	`306`	`\|`
`305`	`307`	`\|`
`@@ -314,6 +316,7 @@ endif::openshift-origin[]`
`314`	`316`	`\|`
`315`	`317`
`316`	`318`	`\|Restricted network`
	`319`	`+\|`
`317`	`320`	`\|xref:../installing/installing_aws/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[X]`
`318`	`321`	`\|`
`319`	`322`	`\|`
`@@ -335,6 +338,7 @@ endif::openshift-origin[]`
`335`	`338`	`\|`
`336`	`339`	`\|`
`337`	`340`	`\|`
	`341`	`+\|`
`338`	`342`	`\|xref:../installing/installing_gcp/installing-gcp-user-infra-vpc.adoc#installing-gcp-user-infra-vpc[X]`
`339`	`343`	`\|`
`340`	`344`	`\|`