From dcde785e8e0c07105529cb4862346181ac85e0a9 Mon Sep 17 00:00:00 2001 From: Patrick Dillon Date: Mon, 10 Jun 2019 15:47:16 -0400 Subject: [PATCH] Remove wildcard comments from proxy. Comments regarding behavior of wildcard characters in noProxy were added prematurely. Remove them until behavior is decided. --- config/v1/types_proxy.go | 5 +---- config/v1/zz_generated.swagger_doc_generated.go | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/config/v1/types_proxy.go b/config/v1/types_proxy.go index 5539c9aa57d..b869785f0cc 100644 --- a/config/v1/types_proxy.go +++ b/config/v1/types_proxy.go @@ -31,10 +31,7 @@ type ProxySpec struct { HTTPSProxy string `json:"httpsProxy,omitempty"` // noProxy is a comma-separated list of hostnames and/or CIDRs for which the proxy should not be used. - // Each name is matched as either a domain which contains the host name as a suffix, or the host name itself. - // For instance, example.com would match example.com, example.com:80, and www.example.com. - // Wildcard(*) characters are not accepted, except a single * character which matches all hosts - // and effectively disables the proxy. Empty means unset and will not result in an env var. + // Empty means unset and will not result in an env var. // +optional NoProxy string `json:"noProxy,omitempty"` } diff --git a/config/v1/zz_generated.swagger_doc_generated.go b/config/v1/zz_generated.swagger_doc_generated.go index 07da832296c..4e9c622e1b1 100644 --- a/config/v1/zz_generated.swagger_doc_generated.go +++ b/config/v1/zz_generated.swagger_doc_generated.go @@ -1119,7 +1119,7 @@ var map_ProxySpec = map[string]string{ "": "ProxySpec contains cluster proxy creation configuration.", "httpProxy": "httpProxy is the URL of the proxy for HTTP requests. Empty means unset and will not result in an env var.", "httpsProxy": "httpsProxy is the URL of the proxy for HTTPS requests. Empty means unset and will not result in an env var.", - "noProxy": "noProxy is a comma-separated list of hostnames and/or CIDRs for which the proxy should not be used. Each name is matched as either a domain which contains the host name as a suffix, or the host name itself. For instance, example.com would match example.com, example.com:80, and www.example.com. Wildcard(*) characters are not accepted, except a single * character which matches all hosts and effectively disables the proxy. Empty means unset and will not result in an env var.", + "noProxy": "noProxy is a comma-separated list of hostnames and/or CIDRs for which the proxy should not be used. Empty means unset and will not result in an env var.", } func (ProxySpec) SwaggerDoc() map[string]string {