add trailing slash for jupyterhub proxy paths (#2387)

nebari-dev · Apr 10, 2024 · e743bad · e743bad
1 parent a5cbb13
commit e743bad
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/...nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/main.tf b/...nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/main.tf
@@ -238,6 +238,12 @@ resource "kubernetes_manifest" "jupyterhub" {
               port = 80
             }
           ]
+          middlewares = [
+            {
+              name      = kubernetes_manifest.jupyterhub-proxy-add-slash.manifest.metadata.name
+              namespace = var.namespace
+            }
+          ]
         },
         {
           kind  = "Rule"

diff --git a/.../stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/middleware.tf b/.../stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/middleware.tf
@@ -13,3 +13,21 @@ resource "kubernetes_manifest" "jupyterhub-middleware-addprefix" {
     }
   }
 }
+
+resource "kubernetes_manifest" "jupyterhub-proxy-add-slash" {
+  manifest = {
+    apiVersion = "traefik.containo.us/v1alpha1"
+    kind       = "Middleware"
+    metadata = {
+      name      = "nebari-jupyterhub-proxy-add-slash"
+      namespace = var.namespace
+    }
+    spec = {
+      redirectRegex = {
+        regex       = "^https://${var.external-url}/user/([^/]+)/proxy/(\\d+)$"
+        replacement = "https://${var.external-url}/user/$${1}/proxy/$${2}/"
+        permanent   = true
+      }
+    }
+  }
+}