Merge pull request #2554 from Shopify/better-defaults

use better defaults for proxy-next-upstream(-tries)
kubernetes · May 24, 2018 · 0d80e0d · 0d80e0d
2 parents 0564c17 + 7d8a013
commit 0d80e0d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/docs/user-guide/nginx-configuration/configmap.md b/docs/user-guide/nginx-configuration/configmap.md
@@ -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-cookie-path](#proxy-cookie-path)|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-tries](#proxy-next-upstream-tries)|int|0|
+|[proxy-next-upstream](#proxy-next-upstream)|string|"error timeout"|
+|[proxy-next-upstream-tries](#proxy-next-upstream-tries)|int|3|
 |[proxy-redirect-from](#proxy-redirect-from)|string|"off"|
 |[proxy-request-buffering](#proxy-request-buffering)|string|"on"|
 |[ssl-redirect](#ssl-redirect)|bool|"true"|

diff --git a/internal/ingress/controller/config/config.go b/internal/ingress/controller/config/config.go
@@ -610,8 +610,8 @@ func NewDefault() Configuration {
 			ProxyBufferSize:        "4k",
 			ProxyCookieDomain:      "off",
 			ProxyCookiePath:        "off",
-			ProxyNextUpstream:      "error timeout invalid_header http_502 http_503 http_504",
-			ProxyNextUpstreamTries: 0,
+			ProxyNextUpstream:      "error timeout",
+			ProxyNextUpstreamTries: 3,
 			ProxyRequestBuffering:  "on",
 			ProxyRedirectFrom:      "off",
 			ProxyRedirectTo:        "off",