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

Fix Rewrite-target regex

Browse source
This commit is contained in:
Daniel Tomcej 2018-07-31 01:08:03 -06:00 committed by Traefiker Bot
parent 7d2b7cd7f1
commit ba3a579d07
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
provider/kubernetes/kubernetes.go
View file

@ -535,7 +535,7 @@ func getRuleForPath(pa extensionsv1beta1.HTTPIngressPath, i *extensionsv1beta1.I
if ruleType == ruleTypeReplacePath { if ruleType == ruleTypeReplacePath {
return "", fmt.Errorf("rewrite-target must not be used together with annotation %q", annotationKubernetesRuleType) return "", fmt.Errorf("rewrite-target must not be used together with annotation %q", annotationKubernetesRuleType)
} }
rewriteTargetRule := fmt.Sprintf("ReplacePathRegex: ^%s/(.*) %s/$1", pa.Path, strings.TrimRight(rewriteTarget, "/")) rewriteTargetRule := fmt.Sprintf("ReplacePathRegex: ^%s(.*) %s$1", pa.Path, strings.TrimRight(rewriteTarget, "/"))
rules = append(rules, rewriteTargetRule) rules = append(rules, rewriteTargetRule)
} }

2
provider/kubernetes/kubernetes_test.go
View file

@ -1410,7 +1410,7 @@ rateset:
frontend("rewrite/api", frontend("rewrite/api",
passHostHeader(), passHostHeader(),
routes( routes(
route("/api", "PathPrefix:/api;ReplacePathRegex: ^/api/(.*) /$1"), route("/api", "PathPrefix:/api;ReplacePathRegex: ^/api(.*) $1"),
route("rewrite", "Host:rewrite")), route("rewrite", "Host:rewrite")),
), ),
frontend("error-pages/errorpages", frontend("error-pages/errorpages",