Refactor browser service configuration; update image and ingress settings, and simplify conditionals in Helm templates

Author: emmanuelmathot

helm-chart/eoapi/templates/services/browser/deployment.yaml

@@ -1,4 +1,4 @@
-{{- if (and (.Values.browser.enabled) (not .Values.testing)  (.Values.docServer.enabled))}}
+{{- if .Values.browser.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -21,6 +21,4 @@ spec:
           env:
             - name: SB_catalogUrl
               value: "/stac"
-            - name: SB_prefixPath
-              value: "/stac-browser"
 {{- end }}

helm-chart/eoapi/templates/services/browser/service.yaml

@@ -1,4 +1,4 @@
-{{- if (and (.Values.browser.enabled) (not .Values.testing)  (.Values.docServer.enabled))}}
+{{- if .Values.browser.enabled }}
 apiVersion: v1
 kind: Service
 metadata:

helm-chart/eoapi/templates/services/doc-server.yaml

@@ -19,7 +19,7 @@ data:
           {{- if .Values.multidim.enabled }}
           <li><a href="/multidim" target="_blank" rel="noopener noreferrer">/multidim</a></li>
           {{- end}}
-          <li><a href="/stac-browser/" target="_blank" rel="noopener noreferrer">/browser</a></li>
+          <li><a href="/browser/" target="_blank" rel="noopener noreferrer">/browser</a></li>
         </ul>
     </body>
     </html>

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

@@ -38,7 +38,7 @@ spec:
             path: /raster{{ .Values.ingress.pathSuffix }}
             backend:
               service:
-                name: raster
+                name: raster-{{ $.Release.Name }}
                 port:
                   number: {{ .Values.service.port }}
           {{- end }}
@@ -48,7 +48,7 @@ spec:
             path: /stac{{ .Values.ingress.pathSuffix }}
             backend:
               service:
-                name: stac
+                name: stac-{{ $.Release.Name }}
                 port:
                   number: {{ .Values.service.port }}
           {{- end }}
@@ -58,7 +58,7 @@ spec:
             path: /vector{{ .Values.ingress.pathSuffix }}
             backend:
               service:
-                name: vector
+                name: vector-{{ $.Release.Name }}
                 port:
                   number: {{ .Values.service.port }}
           {{- end }}
@@ -68,14 +68,14 @@ spec:
             path: /multidim{{ .Values.ingress.pathSuffix }}
             backend:
               service:
-                name: multidim
+                name: multidim-{{ $.Release.Name }}
                 port:
                   number: {{ .Values.service.port }}
           {{- end }}
 
-          {{- if (and (.Values.browser.enabled) (not .Values.testing) (.Values.docServer.enabled)) }}
+          {{- if and .Values.browser.enabled (or (not (hasKey .Values.browser "ingress")) .Values.browser.ingress.enabled) }}
           # We need a separate path because browser does not play well with nginx rewrite_path directive
-          - pathType: Prefix
+          - pathType: {{ .Values.ingress.pathType }}
             path: "/browser"
             backend:
               service:

helm-chart/eoapi/templates/services/multidim/service.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: multidim
+  name: multidim-{{ $.Release.Name }}
   labels:
     app: multidim-{{ .Release.Name }}
 spec:

helm-chart/eoapi/templates/services/raster/service.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: raster
+  name: raster-{{ $.Release.Name }}
   labels:
     app: raster-{{ .Release.Name }}
 spec:

helm-chart/eoapi/templates/services/stac/service.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: stac
+  name: stac-{{ $.Release.Name }}
   labels:
     app: stac-{{ .Release.Name }}
 spec:

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

@@ -19,4 +19,7 @@ spec:
       {{- if .Values.multidim.enabled }}
       - /multidim
       {{- end }}
+      # {{- if .Values.browser.enabled }}
+      # - /browser
+      # {{- end }}
 {{- end }}

helm-chart/eoapi/templates/services/vector/service.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: vector
+  name: vector-{{ $.Release.Name }}
   labels:
     app: vector-{{ .Release.Name }}
 spec:

helm-chart/eoapi/values.yaml

@@ -465,14 +465,15 @@ vector:
 # STAC Browser
 ######################
 # It is a good idea to deploy stac-browser outside of k8s, since it's SPA with static files.
-# Please consider alternatives, such as cloud storage + CDN, for example 
 browser:
   enabled: true
   replicaCount: 1
   image:
     # we use a custom image that overrides pathPrefix value
-    name: ghcr.io/alekzvik/stac-browser-prefix
-    tag: 3.2.0
+    name: ghcr.io/radiantearth/stac-browser
+    tag: 3.3.4
+  ingress:
+    enabled: true  # Control ingress specifically for browser service
 
 docServer:
   enabled: true