From 946845e94d27fc6bf1c9b224db4ce7b69489b201 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 29 Oct 2019 16:44:37 -0700 Subject: [PATCH] modules/*proxy*: httpsProxy supports https:// too Drop the wording from aa39bf33b4 (OSDOCS-640: Adding docs for configuring proxy during installation, 2019-09-12, #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. --- modules/installation-configure-proxy.adoc | 5 ++--- modules/nw-proxy-configure-object.adoc | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/installation-configure-proxy.adoc b/modules/installation-configure-proxy.adoc index 352ebf151a70..ee121c23b2a8 100644 --- a/modules/installation-configure-proxy.adoc +++ b/modules/installation-configure-proxy.adoc @@ -50,7 +50,7 @@ apiVersion: v1 baseDomain: my.domain.com proxy: httpProxy: http://:@: <1> - httpsProxy: http://:@: <2> + httpsProxy: https://:@: <2> noProxy: example.com <3> additionalTrustBundle: | <4> -----BEGIN CERTIFICATE----- @@ -62,8 +62,7 @@ additionalTrustBundle: | <4> URL scheme must be `http`. <2> A proxy URL to use for creating HTTPS connections outside the cluster. If this field is not specified, then `httpProxy` is used for both HTTP and HTTPS -connections. The URL scheme must be `http`; `https` is currently not -supported. +connections. <3> A comma-separated list of destination domain names, domains, IP addresses, or other network CIDRs to exclude proxying. Preface a domain with `.` to include all subdomains of that domain. Use `*` to bypass proxy for all destinations. diff --git a/modules/nw-proxy-configure-object.adoc b/modules/nw-proxy-configure-object.adoc index c16a19184fb3..b99f43092678 100644 --- a/modules/nw-proxy-configure-object.adoc +++ b/modules/nw-proxy-configure-object.adoc @@ -81,7 +81,7 @@ metadata: name: cluster spec: httpProxy: http://:@: <1> - httpsProxy: http://:@: <2> + httpsProxy: https://:@: <2> noProxy: example.com <3> readinessEndpoints: - http://www.google.com <4> @@ -93,8 +93,7 @@ spec: URL scheme must be `http`. <2> A proxy URL to use for creating HTTPS connections outside the cluster. If this is not specified, then `httpProxy` is used for both HTTP and HTTPS -connections. The URL scheme must be `http`; `https` is currently not -supported. +connections. <3> A comma-separated list of destination domain names, domains, IP addresses or other network CIDRs to exclude proxying. Preface a domain with `.` to include all subdomains of that domain. Use `*` to bypass proxy for all destinations.