Add Traefik middleware for path rewriting and update ingress annotations

Author: emmanuelmathot

.github/workflows/helm-tests.yml

@@ -194,7 +194,6 @@ jobs:
         run: |
           kubectl get svc --all-namespaces
           kubectl get ingress --all-namespaces -o jsonpath='{range .items[0]}kubectl describe ingress {.metadata.name} -n {.metadata.namespace}{end}' | sh
-          kubectl get middleware.traefik.io --all-namespaces -o custom-columns='NAMESPACE:.metadata.namespace,NAME:.metadata.name' --no-headers | while read -r namespace name; do kubectl describe middleware.traefik.io "$name" -n "$namespace"; done
 
           PUBLICIP='http://'$(kubectl -n kube-system get svc traefik -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
           export VECTOR_ENDPOINT=$PUBLICIP/vector
@@ -207,10 +206,12 @@ jobs:
           echo $RASTER_ENDPOINT
           echo '#################################'
 
-          pytest .github/workflows/tests/test_vector.py || kubectl logs svc/vector
-          pytest .github/workflows/tests/test_stac.py || kubectl logs svc/stac
+          # Run tests with proper failure propagation
+          set -e  # Make sure any command failure causes the script to exit with error
+          pytest .github/workflows/tests/test_vector.py || { kubectl logs svc/vector; exit 1; }
+          pytest .github/workflows/tests/test_stac.py || { kubectl logs svc/stac; exit 1; }
           # TODO: fix raster tests
-          #pytest .github/workflows/tests/test_raster.py || kubectl logs svc/raster
+          #pytest .github/workflows/tests/test_raster.py || { kubectl logs svc/raster; exit 1; }
 
       - name: error if tests failed
         if: steps.testrunner.outcome == 'failure'

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

@@ -12,6 +12,10 @@ metadata:
   labels:
     app: sharedingress
   annotations:
+    {{- if eq .Values.ingress.className "traefik" }}
+    traefik.ingress.kubernetes.io/router.entrypoints: web
+    traefik.ingress.kubernetes.io/router.middlewares: path-rewrite-middleware-{{ $.Release.Name }}@kubernetescrd
+    {{- end }}
     {{- if .Values.ingress.annotations }}
 {{ toYaml .Values.ingress.annotations | indent 4 }}
     {{- end }}

helm-chart/eoapi/templates/services/traefik-middleware.yaml

@@ -0,0 +1,11 @@
+{{- if and .Values.ingress.enabled (eq .Values.ingress.className "traefik") }}
+apiVersion: traefik.io/v1alpha1
+kind: Middleware
+metadata:
+  name: path-rewrite-middleware-{{ $.Release.Name }}
+  namespace: {{ $.Release.Namespace }}
+spec:
+  replacePathRegex:
+    regex: "^/(raster|vector|stac|multidim)(/|$)(.*)"
+    replacement: "$1/$3"
+{{- end }}

helm-chart/eoapi/test-k3s-unittest-values.yaml

@@ -6,8 +6,6 @@ ingress:
   pathType: "Prefix"
   annotations:
     traefik.ingress.kubernetes.io/router.entrypoints: web
-    traefik.ingress.kubernetes.io/router.pathtransform.regex: "^/([^/]+)(.*)"
-    traefik.ingress.kubernetes.io/router.pathtransform.replacement: "/$1$2"
 pgstacBootstrap:
   enabled: true
   settings: