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

Merge 3412b6ba2f into f42c81817a

Browse source
This commit is contained in:
Daniel (Shijun) Qian 2017-08-18 09:45:15 +00:00 committed by GitHub
commit 6f65ed083e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
controllers/nginx/pkg/template/template.go
View file

@ -312,13 +312,13 @@ func buildProxyPass(host string, b interface{}, loc interface{}) string {
rewrite %s(.*) /$1 break;
rewrite %s / break;
proxy_pass %s://%s;
%v`, path, location.Path, proto, location.Backend, abu)
%v`, path, location.Path, proto, upstreamName, abu)
}
return fmt.Sprintf(`
rewrite %s(.*) %s/$1 break;
proxy_pass %s://%s;
%v`, path, location.Redirect.Target, proto, location.Backend, abu)
%v`, path, location.Redirect.Target, proto, upstreamName, abu)
}
// default proxy_pass