Skip to content

Commit 133e0ae

Browse files
authored
Merge pull request #97541 from openshift-cherrypick-robot/cherry-pick-97449-to-enterprise-4.15
[enterprise-4.15] OCPBUGS#54405 removing invalid parameters from AWS
2 parents eccea41 + 4be38e8 commit 133e0ae

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
@@ -860,23 +860,6 @@ such as `io1`.
860860
|A list of valid AWS availability zones, such as `us-east-1c`, in a
861861
link:https://yaml.org/spec/1.2/spec.html#sequence//[YAML sequence].
862862

863-
|compute:
864-
aws:
865-
region:
866-
|The AWS region that the installation program creates compute resources in.
867-
|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:
868-
[source,terminal]
869-
----
870-
aws ec2 describe-instance-type-offerings --filters Name=instance-type,Values=c7g.xlarge
871-
----
872-
ifndef::openshift-origin[]
873-
[IMPORTANT]
874-
====
875-
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.
876-
====
877-
endif::openshift-origin[]
878-
879-
880863
|controlPlane:
881864
platform:
882865
aws:
@@ -939,12 +922,6 @@ such as `io1`.
939922
control plane machine pool.
940923
|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].
941924

942-
|controlPlane:
943-
aws:
944-
region:
945-
|The AWS region that the installation program creates control plane resources in.
946-
|Valid link:https://docs.aws.amazon.com/general/latest/gr/rande.html[AWS region], such as `us-east-1`.
947-
948925
|platform:
949926
aws:
950927
amiID:
@@ -964,6 +941,22 @@ belong to the same region as the cluster. This is required for regions that requ
964941
|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.
965942
|String, for example `arn:aws:iam::1234567890:role/shared-vpc-role`.
966943

944+
|platform:
945+
aws:
946+
region:
947+
|The AWS region that the installation program creates all cluster resources in.
948+
|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:
949+
[source,terminal]
950+
----
951+
$ aws ec2 describe-instance-type-offerings --filters Name=instance-type,Values=c7g.xlarge
952+
----
953+
ifndef::openshift-origin[]
954+
[IMPORTANT]
955+
====
956+
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.
957+
====
958+
endif::openshift-origin[]
959+
967960
|platform:
968961
aws:
969962
serviceEndpoints:

0 commit comments

Comments
 (0)