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

Fix dynamic configuration when custom errors are enabled (#2212)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-03-19 12:55:17 -03:00 committed by GitHub
parent de30e53d62
commit 6b7491f432
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/file/bindata.go
View file

File diff suppressed because one or more lines are too long

3
rootfs/etc/nginx/template/nginx.tmpl
View file

@ -591,6 +591,7 @@ stream {
{{/* definition of templates to avoid repetitions */}} {{/* definition of templates to avoid repetitions */}}
{{ define "CUSTOM_ERRORS" }} {{ define "CUSTOM_ERRORS" }}
{{ $dynamicConfig := .DynamicConfigurationEnabled}}
{{ $proxySetHeaders := .ProxySetHeaders }} {{ $proxySetHeaders := .ProxySetHeaders }}
{{ range $errCode := .Cfg.CustomHTTPErrors }} {{ range $errCode := .Cfg.CustomHTTPErrors }}
location @custom_{{ $errCode }} { location @custom_{{ $errCode }} {
@ -607,7 +608,7 @@ stream {
rewrite (.*) / break; rewrite (.*) / break;
{{ if .DynamicConfigurationEnabled }} {{ if $dynamicConfig }}
proxy_pass http://upstream_balancer; proxy_pass http://upstream_balancer;
{{ else }} {{ else }}
proxy_pass http://upstream-default-backend; proxy_pass http://upstream-default-backend;