Skip to content

Commit 87848b7

Browse files
authored
Merge pull request #49084 from maxwelldb/installing-preparing-table-fix-gh49074
2 parents d212607 + 3cd3d0a commit 87848b7

File tree

1 file changed

+4
-26
lines changed

1 file changed

+4
-26
lines changed

installing/installing-preparing.adoc

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Not all installation options are supported for all platforms, as shown in the fo
127127
//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.
128128
ifndef::openshift-origin[]
129129
|===
130-
||Alibaba |AWS (x86_64) |AWS (arm64) |Azure |Azure Stack Hub |GCP |Nutanix |{rh-openstack} |{rh-openstack} on SR-IOV |RHV |Bare metal (x86_64) |Bare metal (arm64) |vSphere |VMC |IBM Cloud VPC |IBM Z |IBM Power
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
131131

132132
|Default
133133
|xref:../installing/installing_alibaba/installing-alibaba-default.adoc#installing-alibaba-default[X]
@@ -138,7 +138,6 @@ ifndef::openshift-origin[]
138138
|xref:../installing/installing_gcp/installing-gcp-default.adoc#installing-gcp-default[X]
139139
|xref:../installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc#installing-nutanix-installer-provisioned[X]
140140
|
141-
|
142141
|xref:../installing/installing_rhv/installing-rhv-default.adoc#installing-rhv-default[X]
143142
|xref:../installing/installing_bare_metal_ipi/ipi-install-overview.adoc#ipi-install-overview[X]
144143
|xref:../installing/installing_bare_metal_ipi/ipi-install-overview.adoc#ipi-install-overview[X]
@@ -178,7 +177,6 @@ ifndef::openshift-origin[]
178177
|
179178
|
180179
|
181-
|
182180
|xref:../installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc#installing-vsphere-installer-provisioned-network-customizations[X]
183181
|xref:../installing/installing_vmc/installing-vmc-network-customizations.adoc#installing-vmc-network-customizations[X]
184182
|xref:../installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc#installing-ibm-cloud-network-customizations[X]
@@ -194,7 +192,6 @@ ifndef::openshift-origin[]
194192
|xref:../installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc#installing-restricted-networks-gcp-installer-provisioned[X]
195193
|
196194
|xref:../installing/installing_openstack/installing-openstack-installer-restricted.adoc#installing-openstack-installer-restricted[X]
197-
|
198195
|xref:../installing/installing_rhv/installing-rhv-restricted-network.adoc#installing-rhv-restricted-network[X]
199196
|
200197
|
@@ -221,7 +218,6 @@ ifndef::openshift-origin[]
221218
|
222219
|
223220
|
224-
|
225221

226222
|Existing virtual private networks
227223
|
@@ -240,7 +236,6 @@ ifndef::openshift-origin[]
240236
|
241237
|
242238
|
243-
|
244239

245240
|Government regions
246241
|
@@ -259,7 +254,6 @@ ifndef::openshift-origin[]
259254
|
260255
|
261256
|
262-
|
263257

264258
|Secret regions
265259
|
@@ -278,7 +272,6 @@ ifndef::openshift-origin[]
278272
|
279273
|
280274
|
281-
|
282275

283276
|China regions
284277
|
@@ -297,14 +290,13 @@ ifndef::openshift-origin[]
297290
|
298291
|
299292
|
300-
|
301293
|===
302294
endif::openshift-origin[]
303295

304296
//This table is for OKD only. 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.
305297
ifdef::openshift-origin[]
306298
|===
307-
||Alibaba |AWS |Azure |Azure Stack Hub |GCP |Nutanix |{rh-openstack} |{rh-openstack} on SR-IOV |oVirt |Bare metal |vSphere |VMC |IBM Cloud VPC |IBM Z |IBM Power
299+
||Alibaba |AWS |Azure |Azure Stack Hub |GCP |Nutanix |{rh-openstack} |oVirt |Bare metal |vSphere |VMC |IBM Cloud VPC |IBM Z |IBM Power
308300

309301
|Default
310302
|xref:../installing/installing_alibaba/installing-alibaba-default.adoc#installing-alibaba-default[X]
@@ -314,7 +306,6 @@ ifdef::openshift-origin[]
314306
|xref:../installing/installing_gcp/installing-gcp-default.adoc#installing-gcp-default[X]
315307
|xref:../installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc#installing-nutanix-installer-provisioned[X]
316308
|
317-
|
318309
|xref:../installing/installing_rhv/installing-rhv-default.adoc#installing-rhv-default[X]
319310
|xref:../installing/installing_bare_metal_ipi/ipi-install-overview.adoc#ipi-install-overview[X]
320311
|xref:../installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc#installing-vsphere-installer-provisioned[X]
@@ -349,7 +340,6 @@ ifdef::openshift-origin[]
349340
|xref:../installing/installing_openstack/installing-openstack-installer-kuryr.adoc#installing-openstack-installer-kuryr[X]
350341
|
351342
|
352-
|
353343
|xref:../installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc#installing-vsphere-installer-provisioned-network-customizations[X]
354344
|xref:../installing/installing_vmc/installing-vmc-network-customizations.adoc#installing-vmc-network-customizations[X]
355345
|xref:../installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc#installing-ibm-cloud-network-customizations[X]
@@ -364,7 +354,6 @@ ifdef::openshift-origin[]
364354
|xref:../installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc#installing-restricted-networks-gcp-installer-provisioned[X]
365355
|
366356
|xref:../installing/installing_openstack/installing-openstack-installer-restricted.adoc#installing-openstack-installer-restricted[X]
367-
|
368357
|xref:../installing/installing_rhv/installing-rhv-restricted-network.adoc#installing-rhv-restricted-network[X]
369358
|
370359
|xref:../installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc#installing-restricted-networks-installer-provisioned-vsphere[X]
@@ -388,7 +377,6 @@ ifdef::openshift-origin[]
388377
|
389378
|
390379
|
391-
|
392380

393381
|Existing virtual private networks
394382
|
@@ -405,7 +393,6 @@ ifdef::openshift-origin[]
405393
|
406394
|
407395
|
408-
|
409396

410397
|Government regions
411398
|
@@ -422,7 +409,6 @@ ifdef::openshift-origin[]
422409
|
423410
|
424411
|
425-
|
426412

427413
|Secret regions
428414
|
@@ -439,7 +425,6 @@ ifdef::openshift-origin[]
439425
|
440426
|
441427
|
442-
|
443428

444429
|China regions
445430
|
@@ -456,15 +441,14 @@ ifdef::openshift-origin[]
456441
|
457442
|
458443
|
459-
|
460444
|===
461445
endif::openshift-origin[]
462446

463447
.User-provisioned infrastructure options
464448
//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.
465449
ifndef::openshift-origin[]
466450
|===
467-
||Alibaba |AWS (x86_64) |AWS (arm64) |Azure |Azure Stack Hub |GCP |Nutanix |{rh-openstack} |{rh-openstack} on SR-IOV |RHV |Bare metal (x86_64) |Bare metal (arm64) |vSphere |VMC |IBM Cloud VPC |IBM Z |IBM Z with {op-system-base} KVM |IBM Power |Platform agnostic
451+
||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 Z with {op-system-base} KVM |IBM Power |Platform agnostic
468452

469453
|Custom
470454
|
@@ -498,7 +482,6 @@ ifndef::openshift-origin[]
498482
|
499483
|xref:../installing/installing_openstack/installing-openstack-user-kuryr.adoc#installing-openstack-user-kuryr[X]
500484
|
501-
|
502485
|xref:../installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc#installing-bare-metal-network-customizations[X]
503486
|xref:../installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc#installing-bare-metal-network-customizations[X]
504487
|xref:../installing/installing_vsphere/installing-vsphere-network-customizations.adoc#installing-vsphere-network-customizations[X]
@@ -519,7 +502,6 @@ ifndef::openshift-origin[]
519502
|
520503
|
521504
|
522-
|
523505
|xref:../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[X]
524506
|
525507
|xref:../installing/installing_vsphere/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[X]
@@ -549,14 +531,13 @@ ifndef::openshift-origin[]
549531
|
550532
|
551533
|
552-
|
553534
|===
554535
endif::openshift-origin[]
555536

556537
//This table is for OKD only. 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.
557538
ifdef::openshift-origin[]
558539
|===
559-
||Alibaba |AWS |Azure |Azure Stack Hub |GCP |Nutanix |{rh-openstack} |{rh-openstack} on SR-IOV |oVirt |Bare metal |vSphere |VMC |IBM Cloud VPC |IBM Z |IBM Z with {op-system-base} KVM |IBM Power |Platform agnostic
540+
||Alibaba |AWS |Azure |Azure Stack Hub |GCP |Nutanix |{rh-openstack} |oVirt |Bare metal |vSphere |VMC |IBM Cloud VPC |IBM Z |IBM Z with {op-system-base} KVM |IBM Power |Platform agnostic
560541

561542
|Custom
562543
|
@@ -587,7 +568,6 @@ ifdef::openshift-origin[]
587568
|
588569
|xref:../installing/installing_openstack/installing-openstack-user-kuryr.adoc#installing-openstack-user-kuryr[X]
589570
|
590-
|
591571
|xref:../installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc#installing-bare-metal-network-customizations[X]
592572
|xref:../installing/installing_vsphere/installing-vsphere-network-customizations.adoc#installing-vsphere-network-customizations[X]
593573
|xref:../installing/installing_vmc/installing-vmc-network-customizations-user-infra.adoc#installing-vmc-network-customizations-user-infra[X]
@@ -606,7 +586,6 @@ ifdef::openshift-origin[]
606586
|
607587
|
608588
|
609-
|
610589
|xref:../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[X]
611590
|xref:../installing/installing_vsphere/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[X]
612591
|xref:../installing/installing_vmc/installing-restricted-networks-vmc-user-infra.adoc#installing-restricted-networks-vmc-user-infra[X]
@@ -633,7 +612,6 @@ ifdef::openshift-origin[]
633612
|
634613
|
635614
|
636-
|
637615
|===
638616
endif::openshift-origin[]
639617

0 commit comments

Comments
 (0)