From 7d8a0130a56d84518dfd25b59e93a464be2810ef Mon Sep 17 00:00:00 2001 From: Elvin Efendi Date: Tue, 22 May 2018 16:10:58 -0400 Subject: [PATCH] use better defaults for proxy-next-upstream(-tries) --- docs/user-guide/nginx-configuration/configmap.md | 4 ++-- internal/ingress/controller/config/config.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/user-guide/nginx-configuration/configmap.md b/docs/user-guide/nginx-configuration/configmap.md index 05c12c4cef..951092f089 100644 --- 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 index aa431e4ec1..5d021ccf65 100644 --- 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",