Skip to content

Commit 087da76

Browse files
authored
Merge pull request #97543 from openshift-cherrypick-robot/cherry-pick-97449-to-enterprise-4.17
[enterprise-4.17] OCPBUGS#54405 removing invalid parameters from AWS
2 parents 3c67347 + e9b1215 commit 087da76

File tree

1 file changed

+16
-23
lines changed

1 file changed

+16
-23
lines changed

modules/installation-configuration-parameters.adoc

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -866,23 +866,6 @@ such as `io1`.
866866
|A list of valid AWS availability zones, such as `us-east-1c`, in a
867867
link:https://yaml.org/spec/1.2/spec.html#sequence//[YAML sequence].
868868

869-
|compute:
870-
aws:
871-
region:
872-
|The AWS region that the installation program creates compute resources in.
873-
|Any valid link:https://docs.aws.amazon.com/general/latest/gr/rande.html[AWS region], such as `us-east-1`. You can use the AWS CLI to access the regions available based on your selected instance type. For example:
874-
[source,terminal]
875-
----
876-
aws ec2 describe-instance-type-offerings --filters Name=instance-type,Values=c7g.xlarge
877-
----
878-
ifndef::openshift-origin[]
879-
[IMPORTANT]
880-
====
881-
When running on ARM based AWS instances, ensure that you enter a region where AWS Graviton processors are available. See link:https://aws.amazon.com/ec2/graviton/#Global_availability[Global availability] map in the AWS documentation. Currently, AWS Graviton3 processors are only available in some regions.
882-
====
883-
endif::openshift-origin[]
884-
885-
886869
|controlPlane:
887870
platform:
888871
aws:
@@ -952,12 +935,6 @@ such as `io1`.
952935
control plane machine pool.
953936
|A list of valid AWS availability zones, such as `us-east-1c`, in a link:https://yaml.org/spec/1.2/spec.html#sequence//[YAML sequence].
954937

955-
|controlPlane:
956-
aws:
957-
region:
958-
|The AWS region that the installation program creates control plane resources in.
959-
|Valid link:https://docs.aws.amazon.com/general/latest/gr/rande.html[AWS region], such as `us-east-1`.
960-
961938
|platform:
962939
aws:
963940
amiID:
@@ -977,6 +954,22 @@ belong to the same region as the cluster. This is required for regions that requ
977954
|An Amazon Resource Name (ARN) for an existing IAM role in the account containing the specified hosted zone. The installation program and cluster operators will assume this role when performing operations on the hosted zone. This parameter should only be used if you are installing a cluster into a shared VPC.
978955
|String, for example `arn:aws:iam::1234567890:role/shared-vpc-role`.
979956

957+
|platform:
958+
aws:
959+
region:
960+
|The AWS region that the installation program creates all cluster resources in.
961+
|Any valid link:https://docs.aws.amazon.com/general/latest/gr/rande.html[AWS region], such as `us-east-1`. You can use the AWS CLI to access the regions available based on your selected instance type by running the following command:
962+
[source,terminal]
963+
----
964+
$ aws ec2 describe-instance-type-offerings --filters Name=instance-type,Values=c7g.xlarge
965+
----
966+
ifndef::openshift-origin[]
967+
[IMPORTANT]
968+
====
969+
When running on ARM based AWS instances, ensure that you enter a region where AWS Graviton processors are available. See link:https://aws.amazon.com/ec2/graviton/#Global_availability[Global availability] map in the AWS documentation. Currently, AWS Graviton3 processors are only available in some regions.
970+
====
971+
endif::openshift-origin[]
972+
980973
|platform:
981974
aws:
982975
serviceEndpoints:

0 commit comments

Comments
 (0)