DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2554 from Shopify/better-defaults

Browse source 
use better defaults for proxy-next-upstream(-tries)
This commit is contained in:
k8s-ci-robot 2018-05-23 19:55:34 -07:00 committed by GitHub
commit 0d80e0dd12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/user-guide/nginx-configuration/configmap.md
View file

@ -126,8 +126,8 @@ The following table shows a configuration option's name, type, and the default v
|[proxy-buffer-size](#proxy-buffer-size)|string|"4k"| |[proxy-buffer-size](#proxy-buffer-size)|string|"4k"|
|[proxy-cookie-path](#proxy-cookie-path)|string|"off"| |[proxy-cookie-path](#proxy-cookie-path)|string|"off"|
|[proxy-cookie-domain](#proxy-cookie-domain)|string|"off"| |[proxy-cookie-domain](#proxy-cookie-domain)|string|"off"|
|[proxy-next-upstream](#proxy-next-upstream)|string|"error timeout invalid_header http_502 http_503 http_504"| |[proxy-next-upstream](#proxy-next-upstream)|string|"error timeout"|
|[proxy-next-upstream-tries](#proxy-next-upstream-tries)|int|0| |[proxy-next-upstream-tries](#proxy-next-upstream-tries)|int|3|
|[proxy-redirect-from](#proxy-redirect-from)|string|"off"| |[proxy-redirect-from](#proxy-redirect-from)|string|"off"|
|[proxy-request-buffering](#proxy-request-buffering)|string|"on"| |[proxy-request-buffering](#proxy-request-buffering)|string|"on"|
|[ssl-redirect](#ssl-redirect)|bool|"true"| |[ssl-redirect](#ssl-redirect)|bool|"true"|

4
internal/ingress/controller/config/config.go
View file

@ -610,8 +610,8 @@ func NewDefault() Configuration {
ProxyBufferSize: "4k", ProxyBufferSize: "4k",
ProxyCookieDomain: "off", ProxyCookieDomain: "off",
ProxyCookiePath: "off", ProxyCookiePath: "off",
ProxyNextUpstream: "error timeout invalid_header http_502 http_503 http_504", ProxyNextUpstream: "error timeout",
ProxyNextUpstreamTries: 0, ProxyNextUpstreamTries: 3,
ProxyRequestBuffering: "on", ProxyRequestBuffering: "on",
ProxyRedirectFrom: "off", ProxyRedirectFrom: "off",
ProxyRedirectTo: "off", ProxyRedirectTo: "off",