fix(docs): fix routing /3

Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
werf · May 13, 2024 · 306422f · 306422f
1 parent 0887941
commit 306422f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/docs/.helm/templates/20-ingress.yaml b/docs/.helm/templates/20-ingress.yaml
@@ -51,7 +51,14 @@ spec:
     http:
       paths:
       - path: /docs/{{ $versionURLNormalized }}/
-        pathType: Prefix
+        pathType: ImplementationSpecific
+        backend:
+          service:
+            name: {{ $.Chart.Name }}-{{ $versionDNSNormalized }}
+            port:
+              name: http
+      - path: /documentation/{{ $versionURLNormalized }}/
+        pathType: ImplementationSpecific
         backend:
           service:
             name: {{ $.Chart.Name }}-{{ $versionDNSNormalized }}
@@ -61,7 +68,14 @@ spec:
     http:
       paths:
       - path: /docs/{{ $versionURLNormalized }}/
-        pathType: Prefix
+        pathType: ImplementationSpecific
+        backend:
+          service:
+            name: {{ $.Chart.Name }}-{{ $versionDNSNormalized }}
+            port:
+              name: http
+      - path: /documentation/{{ $versionURLNormalized }}/
+        pathType: ImplementationSpecific
         backend:
           service:
             name: {{ $.Chart.Name }}-{{ $versionDNSNormalized }}

diff --git a/docs/.helm/templates/_rewrites.tpl b/docs/.helm/templates/_rewrites.tpl
@@ -17,8 +17,10 @@ rewrite ^/(?<ver>v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/docs/?$
 rewrite ^/(?<ver>v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/docs/(?<tail>.+)           /docs/$ver/$tail        redirect;
 
 rewrite ^/documentation\.html$                                                         /docs/                  redirect;
-rewrite ^/documentation/(?<ver>v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)$             /docs/$ver/             redirect;
+rewrite ^/documentation/?$                                                             /docs/                  redirect;
+rewrite ^/documentation/(?<ver>v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/?$           /docs/$ver/             redirect;
 rewrite ^/documentation/(?<ver>v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/index\.html$ /docs/$ver/             redirect;
+rewrite ^/documentation/(?<ver>v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/(?<tail>.+)  /docs/$ver/$tail        redirect;
 rewrite ^/(?<ver>v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/documentation\.html$       /docs/$ver/             redirect;
 rewrite ^/(?<ver>v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/documentation/?$           /docs/$ver/             redirect;
 rewrite ^/(?<ver>v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/documentation/(?<tail>.+)  /docs/$ver/$tail        redirect;