fix(ingress): simplify ingress and avoid regex warning (#2187)

- removes regex from ingress to avoid confusion over warning: kubernetes/ingress-nginx#10200 - improves readability at expense of conciseness
specklesystems · Jun 21, 2024 · b5452de · b5452de
1 parent ff55476
commit b5452de
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/utils/helm/speckle-server/templates/master.ingress.yml b/utils/helm/speckle-server/templates/master.ingress.yml
@@ -12,7 +12,6 @@ metadata:
     {{- end }}
     nginx.ingress.kubernetes.io/proxy-body-size: {{ (printf "%dm" (int .Values.file_size_limit_mb)) | quote }}
     nginx.org/client-max-body-size: {{ (printf "%dm" (int .Values.file_size_limit_mb)) | quote }}
-    nginx.ingress.kubernetes.io/use-regex: "true"
 spec:
   ingressClassName: nginx
   {{- if .Values.cert_manager_issuer }}

diff --git a/utils/helm/speckle-server/templates/minion.ingress.yml b/utils/helm/speckle-server/templates/minion.ingress.yml
@@ -11,7 +11,6 @@ metadata:
     cert-manager.io/cluster-issuer: {{ .Values.cert_manager_issuer }}
     {{- end }}
     nginx.ingress.kubernetes.io/proxy-body-size: {{ (printf "%dm" (int .Values.file_size_limit_mb)) | quote }}
-    nginx.ingress.kubernetes.io/use-regex: "true"
 spec:
   ingressClassName: nginx
   rules:
@@ -36,14 +35,49 @@ spec:
               name: www
       {{- end }}
       - pathType: Exact
-        path: "/(graphql|explorer|(auth/.*)|(static/.*))"
+        path: "/graphql"
         backend:
           service:
             name: speckle-server
             port:
               name: web
       - pathType: Exact
-        path: "/((objects/.*)|(api/.*)|(preview/.*))"
+        path: "/explorer"
+        backend:
+          service:
+            name: speckle-server
+            port:
+              name: web
+      - pathType: Prefix
+        path: "/auth/"
+        backend:
+          service:
+            name: speckle-server
+            port:
+              name: web
+      - pathType: Prefix
+        path: "/static/"
+        backend:
+          service:
+            name: speckle-server
+            port:
+              name: web
+      - pathType: Prefix
+        path: "/objects/"
+        backend:
+          service:
+            name: speckle-objects
+            port:
+              name: web
+      - pathType: Prefix
+        path: "/api/"
+        backend:
+          service:
+            name: speckle-objects
+            port:
+              name: web
+      - pathType: Prefix
+        path: "/preview/"
         backend:
           service:
             name: speckle-objects