baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'v1.4' into master

Browse source
This commit is contained in:
Fernandez Ludovic 2017-11-27 11:40:50 +01:00
parent 8cd72cfc1b 0f09551a76
commit 9f6f637527
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
provider/kubernetes/kubernetes.go
View file

@ -355,13 +355,13 @@ func getRuleForPath(pa v1beta1.HTTPIngressPath, i *v1beta1.Ingress) string {
ruleType = ruleTypePathPrefix ruleType = ruleTypePathPrefix
} }
rule := ruleType + ":" + pa.Path rules := []string{ruleType + ":" + pa.Path}
if rewriteTarget := i.Annotations[annotationKubernetesRewriteTarget]; rewriteTarget != "" { if rewriteTarget := i.Annotations[annotationKubernetesRewriteTarget]; rewriteTarget != "" {
rule = ruleTypeReplacePath + ":" + rewriteTarget rules = append(rules, ruleTypeReplacePath+":"+rewriteTarget)
} }
return rule return strings.Join(rules, ";")
} }
func (p *Provider) getPriority(path v1beta1.HTTPIngressPath, i *v1beta1.Ingress) int { func (p *Provider) getPriority(path v1beta1.HTTPIngressPath, i *v1beta1.Ingress) int {

2
provider/kubernetes/kubernetes_test.go
View file

@ -1543,7 +1543,7 @@ func TestIngressAnnotations(t *testing.T) {
PassHostHeader: true, PassHostHeader: true,
Routes: map[string]types.Route{ Routes: map[string]types.Route{
"/api": { "/api": {
Rule: "ReplacePath:/", Rule: "PathPrefix:/api;ReplacePath:/",
}, },
"rewrite": { "rewrite": {
Rule: "Host:rewrite", Rule: "Host:rewrite",