Skip to content

Commit 946845e

Browse files
committed
modules/*proxy*: httpsProxy supports https:// too
Drop the wording from aa39bf3 (OSDOCS-640: Adding docs for configuring proxy during installation, 2019-09-12, openshift#16635), because the network operator explicitly supports both the 'http' and 'https' schemes since openshift/cluster-network-operator@42dbcf8955 (Refactors PR to focus on http/https/no proxy reconciliation, 2019-08-06, openshift/cluster-network-operator#245), which landed before release-4.2 split off from the network operator's master.
1 parent 8e975ab commit 946845e

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

modules/installation-configure-proxy.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ apiVersion: v1
5050
baseDomain: my.domain.com
5151
proxy:
5252
httpProxy: http://<username>:<pswd>@<ip>:<port> <1>
53-
httpsProxy: http://<username>:<pswd>@<ip>:<port> <2>
53+
httpsProxy: https://<username>:<pswd>@<ip>:<port> <2>
5454
noProxy: example.com <3>
5555
additionalTrustBundle: | <4>
5656
-----BEGIN CERTIFICATE-----
@@ -62,8 +62,7 @@ additionalTrustBundle: | <4>
6262
URL scheme must be `http`.
6363
<2> A proxy URL to use for creating HTTPS connections outside the cluster. If
6464
this field is not specified, then `httpProxy` is used for both HTTP and HTTPS
65-
connections. The URL scheme must be `http`; `https` is currently not
66-
supported.
65+
connections.
6766
<3> A comma-separated list of destination domain names, domains, IP addresses, or
6867
other network CIDRs to exclude proxying. Preface a domain with `.` to include
6968
all subdomains of that domain. Use `*` to bypass proxy for all destinations.

modules/nw-proxy-configure-object.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ metadata:
8181
name: cluster
8282
spec:
8383
httpProxy: http://<username>:<pswd>@<ip>:<port> <1>
84-
httpsProxy: http://<username>:<pswd>@<ip>:<port> <2>
84+
httpsProxy: https://<username>:<pswd>@<ip>:<port> <2>
8585
noProxy: example.com <3>
8686
readinessEndpoints:
8787
- http://www.google.com <4>
@@ -93,8 +93,7 @@ spec:
9393
URL scheme must be `http`.
9494
<2> A proxy URL to use for creating HTTPS connections outside the cluster. If
9595
this is not specified, then `httpProxy` is used for both HTTP and HTTPS
96-
connections. The URL scheme must be `http`; `https` is currently not
97-
supported.
96+
connections.
9897
<3> A comma-separated list of destination domain names, domains, IP addresses or
9998
other network CIDRs to exclude proxying. Preface a domain with `.` to include
10099
all subdomains of that domain. Use `*` to bypass proxy for all destinations.

0 commit comments

Comments
 (0)