Skip to content

Commit 852b870

Browse files
authored
Merge pull request #97544 from openshift-cherrypick-robot/cherry-pick-97449-to-enterprise-4.18
[enterprise-4.18] OCPBUGS#54405 removing invalid parameters from AWS
2 parents 2364443 + 43ee0d2 commit 852b870

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

889-
|compute:
890-
aws:
891-
region:
892-
|The AWS region that the installation program creates compute resources in.
893-
|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:
894-
[source,terminal]
895-
----
896-
aws ec2 describe-instance-type-offerings --filters Name=instance-type,Values=c7g.xlarge
897-
----
898-
ifndef::openshift-origin[]
899-
[IMPORTANT]
900-
====
901-
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.
902-
====
903-
endif::openshift-origin[]
904-
905-
906889
|controlPlane:
907890
platform:
908891
aws:
@@ -972,12 +955,6 @@ such as `io1`.
972955
control plane machine pool.
973956
|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].
974957

975-
|controlPlane:
976-
aws:
977-
region:
978-
|The AWS region that the installation program creates control plane resources in.
979-
|Valid link:https://docs.aws.amazon.com/general/latest/gr/rande.html[AWS region], such as `us-east-1`.
980-
981958
|platform:
982959
aws:
983960
amiID:
@@ -997,6 +974,22 @@ belong to the same region as the cluster. This is required for regions that requ
997974
|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.
998975
|String, for example `arn:aws:iam::1234567890:role/shared-vpc-role`.
999976

977+
|platform:
978+
aws:
979+
region:
980+
|The AWS region that the installation program creates all cluster resources in.
981+
|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:
982+
[source,terminal]
983+
----
984+
$ aws ec2 describe-instance-type-offerings --filters Name=instance-type,Values=c7g.xlarge
985+
----
986+
ifndef::openshift-origin[]
987+
[IMPORTANT]
988+
====
989+
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.
990+
====
991+
endif::openshift-origin[]
992+
1000993
|platform:
1001994
aws:
1002995
serviceEndpoints:

0 commit comments

Comments
 (0)