Added overrideRootPath option.

Author: pantierra

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

@@ -40,7 +40,11 @@ spec:
           {{- if (and (.Values.ingress.className) (or (eq .Values.ingress.className "nginx") (eq .Values.ingress.className "traefik"))) }}
           - "--proxy-headers"
           - "--forwarded-allow-ips=*"
+          {{- if .Values.multidim.overrideRootPath}}
+          - "--root-path={{ .Values.multidim.overrideRootPath }}"
+          {{- else }}
           - "--root-path={{ .Values.multidim.ingress.path }}"
+          {{- end }}
           {{- end }}{{/* needed for proxies and path rewrites on NLB */}}
         livenessProbe:
           tcpSocket:
@@ -51,14 +55,22 @@ spec:
           timeoutSeconds: 1
         readinessProbe:
           httpGet:
+            {{- if .Values.multidim.overrideRootPath}}
+            path: {{ .Values.multidim.overrideRootPath }}/healthz
+            {{- else}}
             path: /healthz
+            {{- end}}
             port: {{ .Values.service.port }}
           failureThreshold: 3
           periodSeconds: 15
           successThreshold: 1
         startupProbe:
           httpGet:
+            {{- if .Values.multidim.overrideRootPath}}
+            path: {{ .Values.multidim.overrideRootPath }}/healthz
+            {{- else}}
             path: /healthz
+            {{- end}}
             port: {{ .Values.service.port }}
           # check every sec for 1 minute
           periodSeconds: 1

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

@@ -40,7 +40,11 @@ spec:
           {{- if (and (.Values.ingress.className) (or (eq .Values.ingress.className "nginx") (eq .Values.ingress.className "traefik"))) }}
           - "--proxy-headers"
           - "--forwarded-allow-ips=*"
+          {{- if .Values.raster.overrideRootPath}}
+          - "--root-path={{ .Values.raster.overrideRootPath }}"
+          {{- else }}
           - "--root-path={{ .Values.raster.ingress.path }}"
+          {{- end }}
           {{- end }}{{/* needed for proxies and path rewrites on NLB */}}
         livenessProbe:
           tcpSocket:
@@ -51,14 +55,22 @@ spec:
           timeoutSeconds: 1
         readinessProbe:
           httpGet:
+            {{- if .Values.raster.overrideRootPath}}
+            path: {{ .Values.raster.overrideRootPath }}/healthz
+            {{- else}}
             path: /healthz
+            {{- end}}
             port: {{ .Values.service.port }}
           failureThreshold: 3
           periodSeconds: 15
           successThreshold: 1
         startupProbe:
           httpGet:
+            {{- if .Values.raster.overrideRootPath}}
+            path: {{ .Values.raster.overrideRootPath }}/healthz
+            {{- else}}
             path: /healthz
+            {{- end}}
             port: {{ .Values.service.port }}
           # check every sec for 1 minute
           periodSeconds: 1

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

@@ -40,7 +40,11 @@ spec:
           {{- if (and (.Values.ingress.className) (or (eq .Values.ingress.className "nginx") (eq .Values.ingress.className "traefik"))) }}
           - "--proxy-headers"
           - "--forwarded-allow-ips=*"
+          {{- if .Values.stac.overrideRootPath}}
+          - "--root-path={{ .Values.stac.overrideRootPath }}"
+          {{- else }}
           - "--root-path={{ .Values.stac.ingress.path }}"
+          {{- end }}
           {{- end }}{{/* needed for proxies and path rewrites on NLB */}}
         livenessProbe:
           tcpSocket:
@@ -51,14 +55,22 @@ spec:
           timeoutSeconds: 1
         readinessProbe:
           httpGet:
+            {{- if .Values.stac.overrideRootPath}}
+            path: {{ .Values.stac.overrideRootPath }}/_mgmt/ping
+            {{- else}}
             path: /_mgmt/ping
+            {{- end}}
             port: {{ .Values.service.port }}
           failureThreshold: 3
           periodSeconds: 15
           successThreshold: 1
         startupProbe:
           httpGet:
+            {{- if .Values.stac.overrideRootPath}}
+            path: {{ .Values.stac.overrideRootPath }}/_mgmt/ping
+            {{- else}}
             path: /_mgmt/ping
+            {{- end}}
             port: {{ .Values.service.port }}
           # check every sec for 1 minute
           periodSeconds: 1

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

@@ -40,7 +40,11 @@ spec:
           {{- if (and (.Values.ingress.className) (or (eq .Values.ingress.className "nginx") (eq .Values.ingress.className "traefik"))) }}
           - "--proxy-headers"
           - "--forwarded-allow-ips=*"
+          {{- if .Values.vector.overrideRootPath}}
+          - "--root-path={{ .Values.vector.overrideRootPath }}"
+          {{- else }}
           - "--root-path={{ .Values.vector.ingress.path }}"
+          {{- end }}
           {{- end }}{{/* needed for proxies and path rewrites on NLB */}}
         livenessProbe:
           tcpSocket:
@@ -51,14 +55,22 @@ spec:
           timeoutSeconds: 1
         readinessProbe:
           httpGet:
+            {{- if .Values.vector.overrideRootPath}}
+            path: {{ .Values.vector.overrideRootPath }}/healthz
+            {{- else}}
             path: /healthz
+            {{- end}}
             port: {{ .Values.service.port }}
           failureThreshold: 3
           periodSeconds: 15
           successThreshold: 1
         startupProbe:
           httpGet:
+            {{- if .Values.vector.overrideRootPath}}
+            path: {{ .Values.vector.overrideRootPath }}/healthz
+            {{- else}}
             path: /healthz
+            {{- end}}
             port: {{ .Values.service.port }}
           # check every sec for 1 minute
           periodSeconds: 1

helm-chart/eoapi/values.schema.json

@@ -108,6 +108,7 @@
         }
       }
     },
+
     "postgresql": {
       "type": "object",
       "properties": {
@@ -412,6 +413,10 @@
           },
           "description": "Container command"
         },
+        "overrideRootPath": {
+          "type": "string",
+          "description": "Override root path for this service"
+        },
         "settings": {
           "type": "object",
           "properties": {