From ba3a579d077ac064f4100433b0bec42e207650b0 Mon Sep 17 00:00:00 2001 From: Daniel Tomcej Date: Tue, 31 Jul 2018 01:08:03 -0600 Subject: [PATCH] Fix Rewrite-target regex --- provider/kubernetes/kubernetes.go | 2 +- provider/kubernetes/kubernetes_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/provider/kubernetes/kubernetes.go b/provider/kubernetes/kubernetes.go index d29e52309..628e4ac44 100644 --- a/provider/kubernetes/kubernetes.go +++ b/provider/kubernetes/kubernetes.go @@ -535,7 +535,7 @@ func getRuleForPath(pa extensionsv1beta1.HTTPIngressPath, i *extensionsv1beta1.I if ruleType == ruleTypeReplacePath { 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) } diff --git a/provider/kubernetes/kubernetes_test.go b/provider/kubernetes/kubernetes_test.go index df1cc5953..83d2d3e18 100644 --- a/provider/kubernetes/kubernetes_test.go +++ b/provider/kubernetes/kubernetes_test.go @@ -1410,7 +1410,7 @@ rateset: frontend("rewrite/api", passHostHeader(), routes( - route("/api", "PathPrefix:/api;ReplacePathRegex: ^/api/(.*) /$1"), + route("/api", "PathPrefix:/api;ReplacePathRegex: ^/api(.*) $1"), route("rewrite", "Host:rewrite")), ), frontend("error-pages/errorpages",