Skip to content

Commit 1117b66

Browse files
mletaliemletalie
committed
Further changes to <aws_region> tags.
1 parent a0143e6 commit 1117b66

8 files changed

+42
-42
lines changed

‎modules/cluster-wide-proxy-preqs.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ifdef::openshift-dedicated[]
2222
* You are using the Customer Cloud Subscription (CCS) model for your cluster.
2323
endif::openshift-dedicated[]
2424
* The proxy can access the VPC for the cluster and the private subnets of the VPC. The proxy is also accessible from the VPC for the cluster and from the private subnets of the VPC.
25-
* You have added the `ec2.<region>.amazonaws.com`, `elasticloadbalancing.<region>.amazonaws.com`, and `s3.<region>.amazonaws.com` endpoints to your VPC endpoint. These endpoints are required to complete requests from the nodes to the AWS EC2 API. Because the proxy works at the container level and not at the node level, you must route these requests to the AWS EC2 API through the AWS private network. Adding the public IP address of the EC2 API to your allowlist in your proxy server is not enough.
25+
* You have added the `ec2.<aws_region>.amazonaws.com`, `elasticloadbalancing.<aws_region>.amazonaws.com`, and `s3.<aws_region>.amazonaws.com` endpoints to your VPC endpoint. These endpoints are required to complete requests from the nodes to the AWS EC2 API. Because the proxy works at the container level and not at the node level, you must route these requests to the AWS EC2 API through the AWS private network. Adding the public IP address of the EC2 API to your allowlist in your proxy server is not enough.
2626

2727
[discrete]
2828
[id="cluster-wide-proxy-network-prereqs_{context}"]

‎modules/installation-aws-user-infra-requirements.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ If you are working in a disconnected environment, you are unable to reach the pu
4040

4141
Create a VPC endpoint and attach it to the subnets that the clusters are using. Name the endpoints as follows:
4242

43-
* `ec2.<region>.amazonaws.com`
44-
* `elasticloadbalancing.<region>.amazonaws.com`
45-
* `s3.<region>.amazonaws.com`
43+
* `ec2.<aws_region>.amazonaws.com`
44+
* `elasticloadbalancing.<aws_region>.amazonaws.com`
45+
* `s3.<aws_region>.amazonaws.com`
4646

4747
With this option, network traffic remains private between your VPC and the required AWS services.
4848

@@ -56,9 +56,9 @@ As part of the installation process, you can configure an HTTP or HTTPS proxy. W
5656
=== Option 3: Create a proxy with VPC endpoints
5757
As part of the installation process, you can configure an HTTP or HTTPS proxy with VPC endpoints. Create a VPC endpoint and attach it to the subnets that the clusters are using. Name the endpoints as follows:
5858

59-
* `ec2.<region>.amazonaws.com`
60-
* `elasticloadbalancing.<region>.amazonaws.com`
61-
* `s3.<region>.amazonaws.com`
59+
* `ec2.<aws_region>.amazonaws.com`
60+
* `elasticloadbalancing.<aws_region>.amazonaws.com`
61+
* `s3.<aws_region>.amazonaws.com`
6262

6363
When configuring the proxy in the `install-config.yaml` file, add these endpoints to the `noProxy` field. With this option, the proxy prevents the cluster from accessing the internet directly. However, network traffic remains private between your VPC and the required AWS services.
6464

‎modules/installation-configure-proxy.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ ifndef::aws[]
203203
noProxy: example.com <3>
204204
endif::aws[]
205205
ifdef::aws[]
206-
noProxy: ec2.<region>.amazonaws.com,elasticloadbalancing.<region>.amazonaws.com,s3.<region>.amazonaws.com <3>
206+
noProxy: ec2.<aws_region>.amazonaws.com,elasticloadbalancing.<aws_region>.amazonaws.com,s3.<aws_region>.amazonaws.com <3>
207207
endif::aws[]
208208
additionalTrustBundle: | <4>
209209
-----BEGIN CERTIFICATE-----

‎modules/installation-creating-aws-bootstrap.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,19 +109,19 @@ The bootstrap Ignition config file does contain secrets, like X.509 keys. The fo
109109
},
110110
{
111111
"ParameterKey": "RegisterNlbIpTargetsLambdaArn", <17>
112-
"ParameterValue": "arn:aws:lambda:<region>:<account_number>:function:<dns_stack_name>-RegisterNlbIpTargets-<random_string>" <18>
112+
"ParameterValue": "arn:aws:lambda:<aws_region>:<account_number>:function:<dns_stack_name>-RegisterNlbIpTargets-<random_string>" <18>
113113
},
114114
{
115115
"ParameterKey": "ExternalApiTargetGroupArn", <19>
116-
"ParameterValue": "arn:aws:elasticloadbalancing:<region>:<account_number>:targetgroup/<dns_stack_name>-Exter-<random_string>" <20>
116+
"ParameterValue": "arn:aws:elasticloadbalancing:<aws_region>:<account_number>:targetgroup/<dns_stack_name>-Exter-<random_string>" <20>
117117
},
118118
{
119119
"ParameterKey": "InternalApiTargetGroupArn", <21>
120-
"ParameterValue": "arn:aws:elasticloadbalancing:<region>:<account_number>:targetgroup/<dns_stack_name>-Inter-<random_string>" <22>
120+
"ParameterValue": "arn:aws:elasticloadbalancing:<aws_region>:<account_number>:targetgroup/<dns_stack_name>-Inter-<random_string>" <22>
121121
},
122122
{
123123
"ParameterKey": "InternalServiceTargetGroupArn", <23>
124-
"ParameterValue": "arn:aws:elasticloadbalancing:<region>:<account_number>:targetgroup/<dns_stack_name>-Inter-<random_string>" <24>
124+
"ParameterValue": "arn:aws:elasticloadbalancing:<aws_region>:<account_number>:targetgroup/<dns_stack_name>-Inter-<random_string>" <24>
125125
}
126126
]
127127

‎modules/installation-creating-aws-control-plane.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,19 @@ requires:
100100
},
101101
{
102102
"ParameterKey": "RegisterNlbIpTargetsLambdaArn", <25>
103-
"ParameterValue": "arn:aws:lambda:<region>:<account_number>:function:<dns_stack_name>-RegisterNlbIpTargets-<random_string>" <26>
103+
"ParameterValue": "arn:aws:lambda:<aws_region>:<account_number>:function:<dns_stack_name>-RegisterNlbIpTargets-<random_string>" <26>
104104
},
105105
{
106106
"ParameterKey": "ExternalApiTargetGroupArn", <27>
107-
"ParameterValue": "arn:aws:elasticloadbalancing:<region>:<account_number>:targetgroup/<dns_stack_name>-Exter-<random_string>" <28>
107+
"ParameterValue": "arn:aws:elasticloadbalancing:<aws_region>:<account_number>:targetgroup/<dns_stack_name>-Exter-<random_string>" <28>
108108
},
109109
{
110110
"ParameterKey": "InternalApiTargetGroupArn", <29>
111-
"ParameterValue": "arn:aws:elasticloadbalancing:<region>:<account_number>:targetgroup/<dns_stack_name>-Inter-<random_string>" <30>
111+
"ParameterValue": "arn:aws:elasticloadbalancing:<aws_region>:<account_number>:targetgroup/<dns_stack_name>-Inter-<random_string>" <30>
112112
},
113113
{
114114
"ParameterKey": "InternalServiceTargetGroupArn", <31>
115-
"ParameterValue": "arn:aws:elasticloadbalancing:<region>:<account_number>:targetgroup/<dns_stack_name>-Inter-<random_string>" <32>
115+
"ParameterValue": "arn:aws:elasticloadbalancing:<aws_region>:<account_number>:targetgroup/<dns_stack_name>-Inter-<random_string>" <32>
116116
}
117117
]
118118
----

‎modules/installation-custom-aws-vpc.adoc

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -82,26 +82,26 @@ endif::aws-secret[]
8282
Create a VPC endpoint and attach it to the subnets that the clusters are using. Name the endpoints as follows:
8383

8484
ifndef::aws-china,aws-secret[]
85-
* `ec2.<region>.amazonaws.com`
86-
* `elasticloadbalancing.<region>.amazonaws.com`
87-
* `s3.<region>.amazonaws.com`
85+
* `ec2.<aws_region>.amazonaws.com`
86+
* `elasticloadbalancing.<aws_region>.amazonaws.com`
87+
* `s3.<aws_region>.amazonaws.com`
8888
endif::aws-china,aws-secret[]
8989

9090
ifdef::aws-china[]
91-
* `ec2.<region>.amazonaws.com.cn`
92-
* `elasticloadbalancing.<region>.amazonaws.com`
93-
* `s3.<region>.amazonaws.com`
91+
* `ec2.<aws_region>.amazonaws.com.cn`
92+
* `elasticloadbalancing.<aws_region>.amazonaws.com`
93+
* `s3.<aws_region>.amazonaws.com`
9494
endif::aws-china[]
9595

9696
ifdef::aws-secret[]
9797
SC2S::
98-
** `elasticloadbalancing.<region>.sc2s.sgov.gov`
99-
** `ec2.<region>.sc2s.sgov.gov`
100-
** `s3.<region>.sc2s.sgov.gov`
98+
** `elasticloadbalancing.<aws_region>.sc2s.sgov.gov`
99+
** `ec2.<aws_region>.sc2s.sgov.gov`
100+
** `s3.<aws_region>.sc2s.sgov.gov`
101101
C2S::
102-
** `elasticloadbalancing.<region>.c2s.ic.gov`
103-
** `ec2.<region>.c2s.ic.gov`
104-
** `s3.<region>.c2s.ic.gov`
102+
** `elasticloadbalancing.<aws_region>.c2s.ic.gov`
103+
** `ec2.<aws_region>.c2s.ic.gov`
104+
** `s3.<aws_region>.c2s.ic.gov`
105105
endif::aws-secret[]
106106

107107
With this option, network traffic remains private between your VPC and the required AWS services.
@@ -117,26 +117,26 @@ As part of the installation process, you can configure an HTTP or HTTPS proxy. W
117117
As part of the installation process, you can configure an HTTP or HTTPS proxy with VPC endpoints. Create a VPC endpoint and attach it to the subnets that the clusters are using. Name the endpoints as follows:
118118

119119
ifndef::aws-china,aws-secret[]
120-
* `ec2.<region>.amazonaws.com`
121-
* `elasticloadbalancing.<region>.amazonaws.com`
122-
* `s3.<region>.amazonaws.com`
120+
* `ec2.<aws_region>.amazonaws.com`
121+
* `elasticloadbalancing.<aws_region>.amazonaws.com`
122+
* `s3.<aws_region>.amazonaws.com`
123123
endif::aws-china,aws-secret[]
124124

125125
ifdef::aws-china[]
126-
* `ec2.<region>.amazonaws.com.cn`
127-
* `elasticloadbalancing.<region>.amazonaws.com`
128-
* `s3.<region>.amazonaws.com`
126+
* `ec2.<aws_region>.amazonaws.com.cn`
127+
* `elasticloadbalancing.<aws_region>.amazonaws.com`
128+
* `s3.<aws_region>.amazonaws.com`
129129
endif::aws-china[]
130130

131131
ifdef::aws-secret[]
132132
SC2S::
133-
** `elasticloadbalancing.<region>.sc2s.sgov.gov`
134-
** `ec2.<region>.sc2s.sgov.gov`
135-
** `s3.<region>.sc2s.sgov.gov`
133+
** `elasticloadbalancing.<aws_region>.sc2s.sgov.gov`
134+
** `ec2.<aws_region>.sc2s.sgov.gov`
135+
** `s3.<aws_region>.sc2s.sgov.gov`
136136
C2S::
137-
** `elasticloadbalancing.<region>.c2s.ic.gov`
138-
** `ec2.<region>.c2s.ic.gov`
139-
** `s3.<region>.c2s.ic.gov`
137+
** `elasticloadbalancing.<aws_region>.c2s.ic.gov`
138+
** `ec2.<aws_region>.c2s.ic.gov`
139+
** `s3.<aws_region>.c2s.ic.gov`
140140
endif::aws-secret[]
141141

142142
When configuring the proxy in the `install-config.yaml` file, add these endpoints to the `noProxy` field. With this option, the proxy prevents the cluster from accessing the internet directly. However, network traffic remains private between your VPC and the required AWS services.

‎modules/rosa-sts-setting-up-environment.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ I: Logged in as '<rh-rosa-user>' on 'https://api.openshift.com'
142142
+
143143
[source,terminal]
144144
----
145-
$ rosa verify quota [--region=<region>]
145+
$ rosa verify quota [--region=<aws_region>]
146146
----
147147
+
148148
.Example output

‎modules/storage-persistent-storage-efs-provisioner.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
volumes:
6464
- name: pv-volume
6565
nfs:
66-
server: <file-system-id>.efs.<region>.amazonaws.com <1>
66+
server: <file-system-id>.efs.<aws_region>.amazonaws.com <1>
6767
path: / <2>
6868
----
6969
<1> Contains the DNS name of the EFS volume. This field must be updated

0 commit comments

Comments
 (0)