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

Add proxy-pass-params annotation and Backend field

Browse source
This commit is contained in:
Antoine Cotten 2017-08-31 15:09:23 +02:00
parent abc53ccfc5
commit c0fecd5bd7
No known key found for this signature in database
GPG key ID: EA06C9A94E2B3EA0
4 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
core/pkg/ingress/annotations/proxy/main.go
View file

@ -32,6 +32,7 @@ const (
cookiePath = "ingress.kubernetes.io/proxy-cookie-path"
cookieDomain = "ingress.kubernetes.io/proxy-cookie-domain"
nextUpstream = "ingress.kubernetes.io/proxy-next-upstream"
passParams = "ingress.kubernetes.io/proxy-pass-params"
)
// Configuration returns the proxy timeout to use in the upstream server/s
@ -44,6 +45,7 @@ type Configuration struct {
CookieDomain string `json:"cookieDomain"`
CookiePath string `json:"cookiePath"`
NextUpstream string `json:"nextUpstream"`
PassParams string `json:"passParams"`
}
// Equal tests for equality between two Configuration types
@ -75,6 +77,12 @@ func (l1 *Configuration) Equal(l2 *Configuration) bool {
if l1.CookiePath != l2.CookiePath {
return false
}
if l1.NextUpstream != l2.NextUpstream {
return false
}
if l1.PassParams != l2.PassParams {
return false
}
return true
}
@ -132,5 +140,10 @@ func (a proxy) Parse(ing *extensions.Ingress) (interface{}, error) {
nu = defBackend.ProxyNextUpstream
}
return &Configuration{bs, ct, st, rt, bufs, cd, cp, nu}, nil
pp, err := parser.GetStringAnnotation(passParams, ing)
if err != nil || pp == "" {
pp = defBackend.ProxyPassParams
}
return &Configuration{bs, ct, st, rt, bufs, cd, cp, nu, pp}, nil
}

8
core/pkg/ingress/annotations/proxy/main_test.go
View file

@ -74,6 +74,7 @@ func (m mockBackend) GetDefaultBackend() defaults.Backend {
ProxyBufferSize: "10k",
ProxyBodySize: "3k",
ProxyNextUpstream: "error",
ProxyPassParams: "nocanon keepalive=On",
}
}
@ -87,6 +88,7 @@ func TestProxy(t *testing.T) {
data[bufferSize] = "1k"
data[bodySize] = "2k"
data[nextUpstream] = "off"
data[passParams] = "smax=5 max=10"
ing.SetAnnotations(data)
i, err := NewParser(mockBackend{}).Parse(ing)
@ -115,6 +117,9 @@ func TestProxy(t *testing.T) {
if p.NextUpstream != "off" {
t.Errorf("expected off as next-upstream but returned %v", p.NextUpstream)
}
if p.PassParams != "smax=5 max=10" {
t.Errorf("expected \"smax=5 max=10\" as pass-params but returned \"%v\"", p.PassParams)
}
}
func TestProxyWithNoAnnotation(t *testing.T) {
@ -149,4 +154,7 @@ func TestProxyWithNoAnnotation(t *testing.T) {
if p.NextUpstream != "error" {
t.Errorf("expected error as next-upstream but returned %v", p.NextUpstream)
}
if p.PassParams != "nocanon keepalive=On" {
t.Errorf("expected \"nocanon keepalive=On\" as pass-params but returned \"%v\"", p.PassParams)
}
}