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

Fix overwrite of custom configuration

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-10-06 00:28:21 -03:00
parent 6b80ddaada
commit 50d4124d55
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/pkg/ingress/controller/controller.go
View file

@ -885,7 +885,7 @@ func (ic *GenericController) createServers(data []*extensions.Ingress,
aliases := make(map[string]string, len(data))
bdef := ic.GetDefaultBackend()
ngxProxy := &proxy.Configuration{
ngxProxy := proxy.Configuration{
BodySize: bdef.ProxyBodySize,
ConnectTimeout: bdef.ProxyConnectTimeout,
SendTimeout: bdef.ProxySendTimeout,

2
core/pkg/ingress/controller/util_test.go
View file

@ -51,7 +51,7 @@ func TestMergeLocationAnnotations(t *testing.T) {
"Redirect": redirect.Redirect{},
"Rewrite": rewrite.Redirect{},
"Whitelist": ipwhitelist.SourceRange{},
"Proxy": &proxy.Configuration{},
"Proxy": proxy.Configuration{},
"UsePortInRedirects": true,
}