Skip to content

Commit 38adaba

Browse files
authored
Merge pull request #54770 from ShaunaDiaz/BZ2006197
2 parents c0bf910 + 99f14e7 commit 38adaba

File tree

1 file changed

+15
-28
lines changed

1 file changed

+15
-28
lines changed

modules/nw-proxy-configure-object.adoc

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
[id="nw-proxy-configure-object_{context}"]
99
= Enabling the cluster-wide proxy
1010

11-
The Proxy object is used to manage the cluster-wide egress proxy. When a cluster is
12-
installed or upgraded without the proxy configured, a Proxy object is still
13-
generated but it will have a nil `spec`. For example:
11+
The `Proxy` object is used to manage the cluster-wide egress proxy. When a cluster is installed or upgraded without the proxy configured, a `Proxy` object is still generated but it will have a nil `spec`. For example:
1412

1513
[source,yaml]
1614
----
@@ -24,13 +22,11 @@ spec:
2422
status:
2523
----
2624

27-
A cluster administrator can configure the proxy for {product-title} by modifying
28-
this `cluster` Proxy object.
25+
A cluster administrator can configure the proxy for {product-title} by modifying this `cluster` `Proxy` object.
2926

3027
[NOTE]
3128
====
32-
Only the Proxy object named `cluster` is supported, and no additional
33-
proxies can be created.
29+
Only the `Proxy` object named `cluster` is supported, and no additional proxies can be created.
3430
====
3531

3632
.Prerequisites
@@ -40,13 +36,11 @@ proxies can be created.
4036
4137
.Procedure
4238

43-
. Create a ConfigMap that contains any additional CA certificates required for
44-
proxying HTTPS connections.
39+
. Create a config map that contains any additional CA certificates required for proxying HTTPS connections.
4540
+
4641
[NOTE]
4742
====
48-
You can skip this step if the proxy's identity certificate is signed by an
49-
authority from the RHCOS trust bundle.
43+
You can skip this step if the proxy's identity certificate is signed by an authority from the RHCOS trust bundle.
5044
====
5145

5246
.. Create a file called `user-ca-bundle.yaml` with the following contents, and provide the values of your PEM-encoded certificates:
@@ -65,17 +59,17 @@ metadata:
6559
<1> This data key must be named `ca-bundle.crt`.
6660
<2> One or more PEM-encoded X.509 certificates used to sign the proxy's
6761
identity certificate.
68-
<3> The ConfigMap name that will be referenced from the Proxy object.
69-
<4> The ConfigMap must be in the `openshift-config` namespace.
62+
<3> The config map name that will be referenced from the `Proxy` object.
63+
<4> The config map must be in the `openshift-config` namespace.
7064

71-
.. Create the ConfigMap from this file:
65+
.. Create the config map from this file:
7266
+
7367
[source,terminal]
7468
----
7569
$ oc create -f user-ca-bundle.yaml
7670
----
7771

78-
. Use the `oc edit` command to modify the Proxy object:
72+
. Use the `oc edit` command to modify the `Proxy` object:
7973
+
8074
[source,terminal]
8175
----
@@ -92,7 +86,7 @@ metadata:
9286
name: cluster
9387
spec:
9488
httpProxy: http://<username>:<pswd>@<ip>:<port> <1>
95-
httpsProxy: http://<username>:<pswd>@<ip>:<port> <2>
89+
httpsProxy: https://<username>:<pswd>@<ip>:<port> <2>
9690
noProxy: example.com <3>
9791
readinessEndpoints:
9892
- http://www.google.com <4>
@@ -102,23 +96,16 @@ spec:
10296
----
10397
+
10498
--
105-
<1> A proxy URL to use for creating HTTP connections outside the cluster. The
106-
URL scheme must be `http`.
107-
<2> A proxy URL to use for creating HTTPS connections outside the cluster.
108-
<3> A comma-separated list of destination domain names, domains, IP addresses or
109-
other network CIDRs to exclude proxying.
99+
<1> A proxy URL to use for creating HTTP connections outside the cluster. The URL scheme must be `http`.
100+
<2> A proxy URL to use for creating HTTPS connections outside the cluster. The URL scheme must be either `http` or `https`. Specify a URL for the proxy that supports the URL scheme. For example, most proxies will report an error if they are configured to use `https` but they only support `http`. This failure message may not propagate to the logs and can appear to be a network connection failure instead. If using a proxy that listens for `https` connections from the cluster, you may need to configure the cluster to accept the CAs and certificates that the proxy uses.
101+
<3> A comma-separated list of destination domain names, domains, IP addresses or other network CIDRs to exclude proxying.
110102
+
111103
Preface a domain with `.` to match subdomains only. For example, `.y.com` matches `x.y.com`, but not `y.com`. Use `*` to bypass proxy for all destinations.
112104
If you scale up workers that are not included in the network defined by the `networking.machineNetwork[].cidr` field from the installation configuration, you must add them to this list to prevent connection issues.
113105
+
114106
This field is ignored if neither the `httpProxy` or `httpsProxy` fields are set.
115-
<4> One or more URLs external to the cluster to use to perform a readiness check
116-
before writing the `httpProxy` and `httpsProxy` values to status.
117-
<5> A reference to the ConfigMap in the `openshift-config` namespace that
118-
contains additional CA certificates required for proxying HTTPS connections.
119-
Note that the ConfigMap must already exist before referencing it here. This
120-
field is required unless the proxy's identity certificate is signed by an
121-
authority from the RHCOS trust bundle.
107+
<4> One or more URLs external to the cluster to use to perform a readiness check before writing the `httpProxy` and `httpsProxy` values to status.
108+
<5> A reference to the config map in the `openshift-config` namespace that contains additional CA certificates required for proxying HTTPS connections. Note that the config map must already exist before referencing it here. This field is required unless the proxy's identity certificate is signed by an authority from the RHCOS trust bundle.
122109
--
123110

124111
. Save the file to apply the changes.

0 commit comments

Comments
 (0)