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

Merge pull request #208 from aledbf/master

Browse source 
Fix nil HTTP field
This commit is contained in:
Prashanth B 2017-02-02 13:15:04 -08:00 committed by GitHub
commit e523ca9d33
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
core/pkg/ingress/controller/annotations_test.go
View file

@ -28,10 +28,10 @@ import (
) )
const ( const (
annotation_secureUpstream = "ingress.kubernetes.io/secure-backends" annotationSecureUpstream = "ingress.kubernetes.io/secure-backends"
annotation_upsMaxFails = "ingress.kubernetes.io/upstream-max-fails" annotationUpsMaxFails = "ingress.kubernetes.io/upstream-max-fails"
annotation_upsFailTimeout = "ingress.kubernetes.io/upstream-fail-timeout" annotationUpsFailTimeout = "ingress.kubernetes.io/upstream-fail-timeout"
annotation_passthrough = "ingress.kubernetes.io/ssl-passthrough" annotationPassthrough = "ingress.kubernetes.io/ssl-passthrough"
) )
type mockCfg struct { type mockCfg struct {
@ -106,9 +106,9 @@ func TestSecureUpstream(t *testing.T) {
annotations map[string]string annotations map[string]string
er bool er bool
}{ }{
{map[string]string{annotation_secureUpstream: "true"}, true}, {map[string]string{annotationSecureUpstream: "true"}, true},
{map[string]string{annotation_secureUpstream: "false"}, false}, {map[string]string{annotationSecureUpstream: "false"}, false},
{map[string]string{annotation_secureUpstream + "_no": "true"}, false}, {map[string]string{annotationSecureUpstream + "_no": "true"}, false},
{map[string]string{}, false}, {map[string]string{}, false},
{nil, false}, {nil, false},
} }
@ -131,9 +131,9 @@ func TestHealthCheck(t *testing.T) {
eumf int eumf int
euft int euft int
}{ }{
{map[string]string{annotation_upsMaxFails: "3", annotation_upsFailTimeout: "10"}, 3, 10}, {map[string]string{annotationUpsMaxFails: "3", annotationUpsFailTimeout: "10"}, 3, 10},
{map[string]string{annotation_upsMaxFails: "3"}, 3, 0}, {map[string]string{annotationUpsMaxFails: "3"}, 3, 0},
{map[string]string{annotation_upsFailTimeout: "10"}, 0, 10}, {map[string]string{annotationUpsFailTimeout: "10"}, 0, 10},
{map[string]string{}, 0, 0}, {map[string]string{}, 0, 0},
{nil, 0, 0}, {nil, 0, 0},
} }
@ -164,9 +164,9 @@ func TestSSLPassthrough(t *testing.T) {
annotations map[string]string annotations map[string]string
er bool er bool
}{ }{
{map[string]string{annotation_passthrough: "true"}, true}, {map[string]string{annotationPassthrough: "true"}, true},
{map[string]string{annotation_passthrough: "false"}, false}, {map[string]string{annotationPassthrough: "false"}, false},
{map[string]string{annotation_passthrough + "_no": "true"}, false}, {map[string]string{annotationPassthrough + "_no": "true"}, false},
{map[string]string{}, false}, {map[string]string{}, false},
{nil, false}, {nil, false},
} }

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

@ -620,9 +620,8 @@ func (ic *GenericController) getBackendServers() ([]*ingress.Backend, []*ingress
} }
if rule.HTTP == nil && if rule.HTTP == nil &&
len(ing.Spec.TLS) == 0 &&
host != defServerName { host != defServerName {
glog.V(3).Infof("ingress rule %v/%v does not contains HTTP or TLS rules. using default backend", ing.Namespace, ing.Name) glog.V(3).Infof("ingress rule %v/%v does not contains HTTP rules. using default backend", ing.Namespace, ing.Name)
server.Locations[0].Backend = defBackend.Name server.Locations[0].Backend = defBackend.Name
continue continue
} }