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

Fix rewrite-target Annotation behavior

Browse source
This commit is contained in:
Daniel Tomcej 2018-07-09 16:26:03 -06:00 • committed by Traefiker Bot
parent ba2046491a
commit 9374d6b3b9
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
provider/kubernetes/kubernetes.go
View file

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

2
provider/kubernetes/kubernetes_test.go
View file

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