Add configurable ingress paths for raster, stac, vector, and multidim services

Author: emmanuelmathot

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "makefile.configureOnOpen": false
+}

helm-chart/eoapi/templates/services/ingress.yaml

@@ -36,7 +36,7 @@ spec:
         paths:
           {{- if and .Values.raster.enabled (or (not (hasKey .Values.raster "ingress")) .Values.raster.ingress.enabled) }}
           - pathType: {{ if eq .Values.ingress.className "nginx" }}ImplementationSpecific{{ else }}Prefix{{ end }}
-            path: /raster{{ if eq .Values.ingress.className "nginx" }}(/|$)(.*){{ end }}
+            path: {{ .Values.raster.ingress.path }}{{ if eq .Values.ingress.className "nginx" }}(/|$)(.*){{ end }}
             backend:
               service:
                 name: raster-{{ $.Release.Name }}
@@ -46,7 +46,7 @@ spec:
 
           {{- if and .Values.stac.enabled (or (not (hasKey .Values.stac "ingress")) .Values.stac.ingress.enabled) }}
           - pathType: {{ if eq .Values.ingress.className "nginx" }}ImplementationSpecific{{ else }}Prefix{{ end }}
-            path: /stac{{ if eq .Values.ingress.className "nginx" }}(/|$)(.*){{ end }}
+            path: {{ .Values.stac.ingress.path }}{{ if eq .Values.ingress.className "nginx" }}(/|$)(.*){{ end }}
             backend:
               service:
                 name: stac-{{ $.Release.Name }}
@@ -56,7 +56,7 @@ spec:
 
           {{- if and .Values.vector.enabled (or (not (hasKey .Values.vector "ingress")) .Values.vector.ingress.enabled) }}
           - pathType: {{ if eq .Values.ingress.className "nginx" }}ImplementationSpecific{{ else }}Prefix{{ end }}
-            path: /vector{{ if eq .Values.ingress.className "nginx" }}(/|$)(.*){{ end }}
+            path: {{ .Values.vector.ingress.path }}{{ if eq .Values.ingress.className "nginx" }}(/|$)(.*){{ end }}
             backend:
               service:
                 name: vector-{{ $.Release.Name }}
@@ -66,7 +66,7 @@ spec:
 
           {{- if and .Values.multidim.enabled (or (not (hasKey .Values.multidim "ingress")) .Values.multidim.ingress.enabled) }}
           - pathType: {{ if eq .Values.ingress.className "nginx" }}ImplementationSpecific{{ else }}Prefix{{ end }}
-            path: /multidim{{ if eq .Values.ingress.className "nginx" }}(/|$)(.*){{ end }}
+            path: {{ .Values.multidim.ingress.path }}{{ if eq .Values.ingress.className "nginx" }}(/|$)(.*){{ end }}
             backend:
               service:
                 name: multidim-{{ $.Release.Name }}

helm-chart/eoapi/tests/ingress_tests.yaml

@@ -91,3 +91,65 @@ tests:
       - equal:
           path: spec.rules[0].http.paths[1].backend.service.name
           value: doc-server-RELEASE-NAME
+
+  - it: "custom paths for multiple services with nginx controller"
+    set:
+      ingress.className: "nginx"
+      raster.enabled: true
+      raster.ingress.path: "/titiler"
+      stac.enabled: true
+      stac.ingress.path: "/api"
+      vector.enabled: true
+      vector.ingress.path: "/features"
+      multidim.enabled: false
+      browser.enabled: false
+    asserts:
+      - isKind:
+          of: Ingress
+      - equal:
+          path: spec.rules[0].http.paths[0].path
+          value: "/titiler(/|$)(.*)"
+      - equal:
+          path: spec.rules[0].http.paths[1].path
+          value: "/api(/|$)(.*)"
+      - equal:
+          path: spec.rules[0].http.paths[2].path
+          value: "/features(/|$)(.*)"
+      - equal:
+          path: spec.rules[0].http.paths[0].pathType
+          value: "ImplementationSpecific"
+      - equal:
+          path: spec.rules[0].http.paths[1].pathType
+          value: "ImplementationSpecific"
+      - equal:
+          path: spec.rules[0].http.paths[2].pathType
+          value: "ImplementationSpecific"
+      - equal:
+          path: metadata.annotations
+          value:
+            nginx.ingress.kubernetes.io/use-regex: "true"
+            nginx.ingress.kubernetes.io/rewrite-target: /$2
+
+  - it: "custom paths with traefik controller"
+    set:
+      ingress.className: "traefik"
+      raster.enabled: false
+      stac.enabled: true
+      stac.ingress.path: "/api"
+      vector.enabled: false
+      multidim.enabled: false
+      browser.enabled: false
+    asserts:
+      - isKind:
+          of: Ingress
+      - equal:
+          path: spec.rules[0].http.paths[0].path
+          value: "/api"
+      - equal:
+          path: spec.rules[0].http.paths[0].pathType
+          value: "Prefix"
+      - equal:
+          path: metadata.annotations
+          value:
+            traefik.ingress.kubernetes.io/router.entrypoints: web
+            traefik.ingress.kubernetes.io/router.middlewares: NAMESPACE-strip-prefix-middleware-RELEASE-NAME@kubernetescrd

helm-chart/eoapi/values.yaml

@@ -190,6 +190,7 @@ raster:
   enabled: true
   ingress:
     enabled: true  # Control ingress specifically for raster service
+    path: "/raster"  # Configurable path prefix for the raster service
   autoscaling:
     # NOTE: to have autoscaling working you'll need to install the `eoapi-support` chart
     # see ../../../docs/autoscaling.md for more information
@@ -261,6 +262,7 @@ multidim:
   enabled: false # disabled by default
   ingress:
     enabled: true  # Control ingress specifically for multidim service
+    path: "/multidim"  # Configurable path prefix for the multidim service
   autoscaling:
     # NOTE: to have autoscaling working you'll need to install the `eoapi-support` chart
     # see ../../../docs/autoscaling.md for more information
@@ -332,6 +334,7 @@ stac:
   enabled: true
   ingress:
     enabled: true  # Control ingress specifically for stac service
+    path: "/stac"  # Configurable path prefix for the stac service
   autoscaling:
     # NOTE: to have autoscaling working you'll need to install the `eoapi-support` chart
     # see ../../../docs/autoscaling.md for more information
@@ -391,6 +394,7 @@ vector:
   enabled: true
   ingress:
     enabled: true  # Control ingress specifically for vector service
+    path: "/vector"  # Configurable path prefix for the vector service
   autoscaling:
     # NOTE: to have autoscaling working you'll need to install the `eoapi-support` chart
     # see ../../../docs/autoscaling.md for more information
@@ -473,4 +477,4 @@ docServer:
 # prefer to set it in the command line
 # helm upgrade --set previousVersion=$PREVIOUS_VERSION
 # or in the CI/CD pipeline
-previousVersion: ""
+previousVersion: ""