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

Merge pull request #1802 from aledbf/fix-vars

Browse source 
Automatic merge from submit-queue

[nginx-ingress-controller] Initialize proxy_upstream_name variable

fixes #1801
This commit is contained in:
Kubernetes Submit Queue 2016-09-29 11:28:25 -07:00 committed by GitHub
commit 90d8402293
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/nginx/nginx.tmpl
View file

@ -314,6 +314,7 @@ http {
} }
location / { location / {
set $proxy_upstream_name "upstream-default-backend";
proxy_pass http://upstream-default-backend; proxy_pass http://upstream-default-backend;
} }
{{- template "CUSTOM_ERRORS" $cfg }} {{- template "CUSTOM_ERRORS" $cfg }}
@ -322,6 +323,7 @@ http {
# default server for services without endpoints # default server for services without endpoints
server { server {
listen 8181; listen 8181;
set $proxy_upstream_name "-";
location / { location / {
{{ if .customErrors }} {{ if .customErrors }}