Skip to content

Commit 6a46ed6

Browse files
authored
Merge pull request #52199 from bscott-rh/OCPBUGS-2890
OCPBUGS#2890 Removing supported instance types from AWS UPI restricted doc
2 parents 241555d + b0c7a58 commit 6a46ed6

File tree

4 files changed

+24
-7
lines changed

4 files changed

+24
-7
lines changed

installing/installing_aws/installing-aws-secret-region.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
4646

4747
include::modules/installation-initializing-manual.adoc[leveloffset=+1]
4848
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
49-
include::modules/installation-supported-aws-machine-types.adoc[leveloffset=+2]
49+
include::modules/installation-aws-tested-machine-types.adoc[leveloffset=+2]
5050
include::modules/installation-aws-config-yaml.adoc[leveloffset=+2]
5151
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
5252

installing/installing_aws/installing-aws-user-infra.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ include::modules/installation-aws-tested-machine-types.adoc[leveloffset=+2]
5151
include::modules/installation-aws-arm-tested-machine-types.adoc[leveloffset=+2]
5252
include::modules/csr-management.adoc[leveloffset=+2]
5353

54-
include::modules/installation-supported-aws-machine-types.adoc[leveloffset=+2]
55-
5654
include::modules/installation-aws-user-infra-requirements.adoc[leveloffset=+1]
5755

5856
include::modules/installation-aws-permissions.adoc[leveloffset=+2]

installing/installing_aws/installing-restricted-networks-aws.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ include::modules/installation-aws-tested-machine-types.adoc[leveloffset=+2]
6969
include::modules/installation-aws-arm-tested-machine-types.adoc[leveloffset=+2]
7070
include::modules/csr-management.adoc[leveloffset=+2]
7171

72-
include::modules/installation-supported-aws-machine-types.adoc[leveloffset=+2]
73-
7472
include::modules/installation-aws-user-infra-requirements.adoc[leveloffset=+1]
7573

7674
include::modules/installation-aws-permissions.adoc[leveloffset=+2]

modules/installation-aws-tested-machine-types.adoc

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// installing/installing_aws/installing-aws-government-region.adoc
66
// installing/installing_aws/installing-aws-network-customizations.adoc
77
// installing/installing_aws/installing-aws-private.adoc
8+
// installing/installing_aws/installing-aws-secret-region.adoc
89
// installing/installing_aws/installing-aws-user-infra.adoc
910
// installing/installing_aws/installing-aws-vpc.adoc
1011
// installing/installing_aws/installing-restricted-networks-aws.adoc
@@ -13,6 +14,9 @@
1314
ifeval::["{context}" == "installing-aws-localzone"]
1415
:localzone:
1516
endif::[]
17+
ifeval::["{context}" == "installing-aws-secret-region"]
18+
:secretregion:
19+
endif::[]
1620

1721
[id="installation-aws-tested-machine-types_{context}"]
1822
= Tested instance types for AWS
@@ -30,13 +34,13 @@ endif::localzone[]
3034
Use the machine types included in the following charts for your AWS instances. If you use an instance type that is not listed in the chart, ensure that the instance size you use matches the minimum resource requirements that are listed in "Minimum resource requirements for cluster installation".
3135
====
3236

33-
ifndef::localzone[]
37+
ifndef::localzone,secretregion[]
3438
.Machine types based on 64-bit x86 architecture
3539
[%collapsible]
3640
====
3741
include::https://raw.githubusercontent.com/openshift/installer/master/docs/user/aws/tested_instance_types_x86_64.md[]
3842
====
39-
endif::localzone[]
43+
endif::localzone,secretregion[]
4044
ifdef::localzone[]
4145
.Machine types based on 64-bit x86 architecture for AWS Local Zones
4246
[%collapsible]
@@ -49,7 +53,24 @@ ifdef::localzone[]
4953
* `t3.*`
5054
====
5155
endif::localzone[]
56+
ifdef::secretregion[]
57+
.Machine types based on 64-bit x86 architecture for secret regions
58+
[%collapsible]
59+
====
60+
* `c4.*`
61+
* `c5.*`
62+
* `i3.*`
63+
* `m4.*`
64+
* `m5.*`
65+
* `r4.*`
66+
* `r5.*`
67+
* `t3.*`
68+
====
69+
endif::secretregion[]
5270

5371
ifeval::["{context}" == "installing-aws-localzone"]
5472
:!localzone:
73+
endif::[]
74+
ifeval::["{context}" == "installing-aws-secret-region"]
75+
:!secretregion:
5576
endif::[]

0 commit comments

Comments
 (0)