Skip to content

Commit 8736b78

Browse files
committed
OSDOCS-10038:Additional trust bundle policy set to Always for add trust bundles
1 parent 336c698 commit 8736b78

8 files changed

+9
-39
lines changed

modules/cluster-wide-proxy-preqs.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ endif::openshift-dedicated[]
2929
+
3030
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.
3131
+
32-
[NOTE]
32+
[IMPORTANT]
3333
====
34-
When using a cluster-wide proxy, you must configure the `s3.<aws_region>.amazonaws.com` endpoint as type `Gateway`. Also, you can configure the `ec2.<aws_region>.amazonaws.com` and `elasticloadbalancing.<aws_region>.amazonaws.com` endpoints only as type `Interface`.
34+
When using a cluster-wide proxy, you must configure the `s3.<aws_region>.amazonaws.com` endpoint as type `Gateway`.
3535
====
3636

3737
[discrete]

modules/configuring-a-proxy-after-installation-cli.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ $ rosa edit cluster \
3636
+
3737
--
3838
<1> The `additional-trust-bundle-file`, `http-proxy`, and `https-proxy` arguments are all optional.
39-
<2> The `additional-trust-bundle-file` argument is a file path pointing to a bundle of PEM-encoded X.509 certificates, which are all concatenated together. The `additionalTrustBundle` parameter is required unless the identity certificate of the proxy is signed by an authority from the {op-system} trust bundle. If you use an MITM transparent proxy network that does not require additional proxy configuration but requires additional CAs, you must provide the MITM CA certificate.
39+
<2> The `additional-trust-bundle-file` argument is a file path pointing to a bundle of PEM-encoded X.509 certificates, which are all concatenated together. The additional-trust-bundle-file argument is a file path pointing to a bundle of PEM-encoded X.509 certificates, which are all concatenated together. The additional-trust-bundle-file argument is required for users who use a TLS-inspecting proxy unless the identity certificate for the proxy is signed by an authority from the {op-system-first} trust bundle. This applies regardless of whether the proxy is transparent or requires explicit configuration using the `http-proxy` and `https-proxy` arguments.
4040
+
4141
[NOTE]
4242
====

modules/configuring-a-proxy-after-installation-ocm.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ endif::openshift-dedicated[]
3737
.. Enter a value in at least one of the following fields:
3838
** Specify a valid *HTTP proxy URL*.
3939
** Specify a valid *HTTPS proxy URL*.
40-
** In the *Additional trust bundle* field, provide a PEM encoded X.509 certificate bundle. If you are replacing an existing trust bundle file, select *Replace file* to view the field. The bundle is added to the trusted certificate store for the cluster nodes. An additional trust bundle file is required unless the identity certificate for the proxy is signed by an authority from the {op-system-first} trust bundle.
41-
+
42-
If you use an MITM transparent proxy network that does not require additional proxy configuration but requires additional certificate authorities (CAs), you must provide the MITM CA certificate.
40+
** In the *Additional trust bundle* field, provide a PEM encoded X.509 certificate bundle. If you are replacing an existing trust bundle file, select *Replace file* to view the field. The bundle is added to the trusted certificate store for the cluster nodes. An additional trust bundle file is required if you use a TLS-inspecting proxy unless the identity certificate for the proxy is signed by an authority from the {op-system-first} trust bundle. This requirement applies regardless of whether the proxy is transparent or requires explicit configuration using the `http-proxy` and `https-proxy` arguments.
4341
+
4442
.. Click *Confirm*.
4543

modules/configuring-a-proxy-during-installation-cli.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ $ rosa create cluster \
3030
+
3131
--
3232
<1> The `additional-trust-bundle-file`, `http-proxy`, and `https-proxy` arguments are all optional.
33-
<2> The `additional-trust-bundle-file` argument is a file path pointing to a bundle of PEM-encoded X.509 certificates, which are all concatenated together. The `additionalTrustBundle` parameter is required unless the identity certificate of the proxy is signed by an authority from the {op-system} trust bundle. If you use an MITM transparent proxy network that does not require additional proxy configuration but requires additional CAs, you must provide the MITM CA certificate.
33+
<2> The `additional-trust-bundle-file` argument is a file path pointing to a bundle of PEM-encoded X.509 certificates, which are all concatenated together. The additional-trust-bundle-file argument is required for users who use a TLS-inspecting proxy unless the identity certificate for the proxy is signed by an authority from the {op-system-first} trust bundle. This applies regardless of whether the proxy is transparent or requires explicit configuration using the http-proxy and https-proxy arguments.
3434
<3> The `http-proxy` and `https-proxy` arguments must point to a valid URL.
3535
<4> A comma-separated list of destination domain names, IP addresses, or network CIDRs to exclude proxying.
3636
+

modules/osd-create-cluster-ccs.adoc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,15 +304,12 @@ For more information, see the requirements for _Security groups_ under _Addition
304304
endif::osd-on-aws[]
305305
. If you opted to configure a cluster-wide proxy, provide your proxy configuration details on the *Cluster-wide proxy* page:
306306
+
307-
--
308307
.. Enter a value in at least one of the following fields:
309308
** Specify a valid *HTTP proxy URL*.
310309
** Specify a valid *HTTPS proxy URL*.
311-
** In the *Additional trust bundle* field, provide a PEM encoded X.509 certificate bundle. The bundle is added to the trusted certificate store for the cluster nodes. An additional trust bundle file is required unless the identity certificate for the proxy is signed by an authority from the {op-system-first} trust bundle.
310+
** In the *Additional trust bundle* field, provide a PEM encoded X.509 certificate bundle. The bundle is added to the trusted certificate store for the cluster nodes. An additional trust bundle file is required if you use a TLS-inspecting proxy unless the identity certificate for the proxy is signed by an authority from the {op-system-first} trust bundle. This requirement applies regardless of whether the proxy is transparent or requires explicit configuration using the `http-proxy` and `https-proxy` arguments.
312311
+
313-
If you use an MITM transparent proxy network that does not require additional proxy configuration but requires additional certificate authorities (CAs), you must provide the MITM CA certificate.
314312
.. Click *Next*.
315-
--
316313
+
317314
For more information about configuring a proxy with {product-title}, see _Configuring a cluster-wide proxy_.
318315

modules/osd-create-cluster-gcp-account.adoc

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,20 +127,12 @@ If you are installing a cluster into a Shared VPC, the VPC name and subnets are
127127
. Click *Next*.
128128
. If you opted to configure a cluster-wide proxy, provide your proxy configuration details on the *Cluster-wide proxy* page:
129129
+
130-
--
131130
.. Enter a value in at least one of the following fields:
132131
** Specify a valid *HTTP proxy URL*.
133132
** Specify a valid *HTTPS proxy URL*.
134-
** In the *Additional trust bundle* field, provide a PEM encoded X.509 certificate bundle. The bundle is added to the trusted certificate store for the cluster nodes. An additional trust bundle file is required unless the identity certificate for the proxy is signed by an authority from the {op-system-first} trust bundle.
133+
** In the *Additional trust bundle* field, provide a PEM encoded X.509 certificate bundle. The bundle is added to the trusted certificate store for the cluster nodes. An additional trust bundle file is required if you use a TLS-inspecting proxy unless the identity certificate for the proxy is signed by an authority from the {op-system-first} trust bundle. This requirement applies regardless of whether the proxy is transparent or requires explicit configuration using the `http-proxy` and `https-proxy` arguments.
135134
+
136-
If you use an MITM transparent proxy network that does not require additional proxy configuration but requires additional certificate authorities (CAs), you must provide the MITM CA certificate.
137-
+
138-
[NOTE]
139-
====
140-
If you upload an additional trust bundle file without specifying an HTTP or HTTPS proxy URL, the bundle is set on the cluster but is not configured to be used with the proxy.
141-
====
142135
.. Click *Next*.
143-
--
144136
+
145137
For more information about configuring a proxy with {product-title}, see _Configuring a cluster-wide proxy_.
146138

modules/osd-create-cluster-rhm-gcp-account.adoc

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,20 +126,12 @@ If you are installing a cluster into a Shared VPC, the VPC name and subnets are
126126
. Click *Next*.
127127
. If you opted to configure a cluster-wide proxy, provide your proxy configuration details on the *Cluster-wide proxy* page:
128128
+
129-
--
130129
.. Enter a value in at least one of the following fields:
131130
** Specify a valid *HTTP proxy URL*.
132131
** Specify a valid *HTTPS proxy URL*.
133-
** In the *Additional trust bundle* field, provide a PEM encoded X.509 certificate bundle. The bundle is added to the trusted certificate store for the cluster nodes. An additional trust bundle file is required unless the identity certificate for the proxy is signed by an authority from the {op-system-first} trust bundle.
132+
** In the *Additional trust bundle* field, provide a PEM encoded X.509 certificate bundle. The bundle is added to the trusted certificate store for the cluster nodes. An additional trust bundle file is required if you use a TLS-inspecting proxy unless the identity certificate for the proxy is signed by an authority from the {op-system-first} trust bundle. This requirement applies regardless of whether the proxy is transparent or requires explicit configuration using the `http-proxy` and `https-proxy` arguments.
134133
+
135-
If you use an MITM transparent proxy network that does not require additional proxy configuration but requires additional certificate authorities (CAs), you must provide the MITM CA certificate.
136-
+
137-
[NOTE]
138-
====
139-
If you upload an additional trust bundle file without specifying an HTTP or HTTPS proxy URL, the bundle is set on the cluster but is not configured to be used with the proxy.
140-
====
141134
.. Click *Next*.
142-
--
143135
+
144136
For more information about configuring a proxy with {product-title}, see _Configuring a cluster-wide proxy_.
145137

modules/rosa-sts-creating-a-cluster-with-customizations-ocm.adoc

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -318,20 +318,11 @@ For more information, see the requirements for _Security groups_ under _Addition
318318

319319
. If you opted to configure a cluster-wide proxy, provide your proxy configuration details on the *Cluster-wide proxy* page:
320320
+
321-
--
322321
.. Enter a value in at least one of the following fields:
323322
** Specify a valid *HTTP proxy URL*.
324323
** Specify a valid *HTTPS proxy URL*.
325-
** In the *Additional trust bundle* field, provide a PEM encoded X.509 certificate bundle. The bundle is added to the trusted certificate store for the cluster nodes. An additional trust bundle file is required unless the identity certificate for the proxy is signed by an authority from the {op-system-first} trust bundle.
326-
+
327-
If you use an MITM transparent proxy network that does not require additional proxy configuration but requires additional certificate authorities (CAs), you must provide the MITM CA certificate.
328-
+
329-
[NOTE]
330-
====
331-
If you upload an additional trust bundle file without specifying an HTTP or HTTPS proxy URL, the bundle is set on the cluster but is not configured to be used with the proxy.
332-
====
324+
** In the *Additional trust bundle* field, provide a PEM encoded X.509 certificate bundle. The bundle is added to the trusted certificate store for the cluster nodes. An additional trust bundle file is required if you use a TLS-inspecting proxy unless the identity certificate for the proxy is signed by an authority from the {op-system-first} trust bundle. This requirement applies regardless of whether the proxy is transparent or requires explicit configuration using the `http-proxy` and `https-proxy` arguments.
333325
.. Click *Next*.
334-
--
335326
+
336327
For more information about configuring a proxy with {product-title}, see _Configuring a cluster-wide proxy_.
337328

0 commit comments

Comments
 (0)