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

fix: rename proxy-buffer-number to proxy-buffers-number

Browse source
This commit is contained in:
Jim Zhang 2019-02-22 10:21:17 +08:00
parent 81e4440bdb
commit dc63e5d185
10 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/ingress/annotations/proxy/main.go
View file

@ -29,7 +29,7 @@ type Config struct {
ConnectTimeout int `json:"connectTimeout"`
SendTimeout int `json:"sendTimeout"`
ReadTimeout int `json:"readTimeout"`
BufferNumber int `json:"bufferNumber"`
BuffersNumber int `json:"buffersNumber"`
BufferSize string `json:"bufferSize"`
CookieDomain string `json:"cookieDomain"`
CookiePath string `json:"cookiePath"`
@ -61,7 +61,7 @@ func (l1 *Config) Equal(l2 *Config) bool {
if l1.ReadTimeout != l2.ReadTimeout {
return false
}
if l1.BufferNumber != l2.BufferNumber {
if l1.BuffersNumber != l2.BuffersNumber {
return false
}
if l1.BufferSize != l2.BufferSize {
@ -127,9 +127,9 @@ func (a proxy) Parse(ing *extensions.Ingress) (interface{}, error) {
config.ReadTimeout = defBackend.ProxyReadTimeout
}
config.BufferNumber, err = parser.GetIntAnnotation("proxy-buffer-number", ing)
config.BuffersNumber, err = parser.GetIntAnnotation("proxy-buffers-number", ing)
if err != nil {
config.BufferNumber = defBackend.ProxyBufferNumber
config.BuffersNumber = defBackend.ProxyBuffersNumber
}
config.BufferSize, err = parser.GetStringAnnotation("proxy-buffer-size", ing)