Skip to content

Commit 007d372

Browse files
committed
Added overrideRootPath option.
1 parent b98818c commit 007d372

File tree

4 files changed

+48
-0
lines changed

4 files changed

+48
-0
lines changed

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ spec:
4040
{{- if (and (.Values.ingress.className) (or (eq .Values.ingress.className "nginx") (eq .Values.ingress.className "traefik"))) }}
4141
- "--proxy-headers"
4242
- "--forwarded-allow-ips=*"
43+
{{- if .Values.overrideRootPath}}
44+
- "--root-path={{ .Values.overrideRootPath }}"
45+
{{-- else }}
4346
- "--root-path={{ .Values.multidim.ingress.path }}"
47+
{{- end }}
4448
{{- end }}{{/* needed for proxies and path rewrites on NLB */}}
4549
livenessProbe:
4650
tcpSocket:
@@ -51,14 +55,22 @@ spec:
5155
timeoutSeconds: 1
5256
readinessProbe:
5357
httpGet:
58+
{{- if .Values.overrideRootPath}}
59+
path: {{ .Values.overrideRootPath }}/healthz
60+
{{- else}}
5461
path: /healthz
62+
{{- end}}
5563
port: {{ .Values.service.port }}
5664
failureThreshold: 3
5765
periodSeconds: 15
5866
successThreshold: 1
5967
startupProbe:
6068
httpGet:
69+
{{- if .Values.overrideRootPath}}
70+
path: {{ .Values.overrideRootPath }}/healthz
71+
{{- else}}
6172
path: /healthz
73+
{{- end}}
6274
port: {{ .Values.service.port }}
6375
# check every sec for 1 minute
6476
periodSeconds: 1

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ spec:
4040
{{- if (and (.Values.ingress.className) (or (eq .Values.ingress.className "nginx") (eq .Values.ingress.className "traefik"))) }}
4141
- "--proxy-headers"
4242
- "--forwarded-allow-ips=*"
43+
{{- if .Values.overrideRootPath}}
44+
- "--root-path={{ .Values.overrideRootPath }}"
45+
{{- else }}
4346
- "--root-path={{ .Values.raster.ingress.path }}"
47+
{{- end }}
4448
{{- end }}{{/* needed for proxies and path rewrites on NLB */}}
4549
livenessProbe:
4650
tcpSocket:
@@ -51,14 +55,22 @@ spec:
5155
timeoutSeconds: 1
5256
readinessProbe:
5357
httpGet:
58+
{{- if .Values.overrideRootPath}}
59+
path: {{ .Values.overrideRootPath }}/healthz
60+
{{- else}}
5461
path: /healthz
62+
{{- end}}
5563
port: {{ .Values.service.port }}
5664
failureThreshold: 3
5765
periodSeconds: 15
5866
successThreshold: 1
5967
startupProbe:
6068
httpGet:
69+
{{- if .Values.overrideRootPath}}
70+
path: {{ .Values.overrideRootPath }}/healthz
71+
{{- else}}
6172
path: /healthz
73+
{{- end}}
6274
port: {{ .Values.service.port }}
6375
# check every sec for 1 minute
6476
periodSeconds: 1

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ spec:
4040
{{- if (and (.Values.ingress.className) (or (eq .Values.ingress.className "nginx") (eq .Values.ingress.className "traefik"))) }}
4141
- "--proxy-headers"
4242
- "--forwarded-allow-ips=*"
43+
{{- if .Values.overrideRootPath}}
44+
- "--root-path={{ .Values.overrideRootPath }}"
45+
{{- else }}
4346
- "--root-path={{ .Values.stac.ingress.path }}"
47+
{{- end }}
4448
{{- end }}{{/* needed for proxies and path rewrites on NLB */}}
4549
livenessProbe:
4650
tcpSocket:
@@ -51,14 +55,22 @@ spec:
5155
timeoutSeconds: 1
5256
readinessProbe:
5357
httpGet:
58+
{{- if .Values.overrideRootPath}}
59+
path: {{ .Values.overrideRootPath }}/_mgmt/ping
60+
{{- else}}
5461
path: /_mgmt/ping
62+
{{- end}}
5563
port: {{ .Values.service.port }}
5664
failureThreshold: 3
5765
periodSeconds: 15
5866
successThreshold: 1
5967
startupProbe:
6068
httpGet:
69+
{{- if .Values.overrideRootPath}}
70+
path: {{ .Values.overrideRootPath }}/_mgmt/ping
71+
{{- else}}
6172
path: /_mgmt/ping
73+
{{- end}}
6274
port: {{ .Values.service.port }}
6375
# check every sec for 1 minute
6476
periodSeconds: 1

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ spec:
4040
{{- if (and (.Values.ingress.className) (or (eq .Values.ingress.className "nginx") (eq .Values.ingress.className "traefik"))) }}
4141
- "--proxy-headers"
4242
- "--forwarded-allow-ips=*"
43+
{{- if .Values.overrideRootPath}}
44+
- "--root-path={{ .Values.overrideRootPath }}"
45+
{{- else }}
4346
- "--root-path={{ .Values.vector.ingress.path }}"
47+
{{- end }}
4448
{{- end }}{{/* needed for proxies and path rewrites on NLB */}}
4549
livenessProbe:
4650
tcpSocket:
@@ -51,14 +55,22 @@ spec:
5155
timeoutSeconds: 1
5256
readinessProbe:
5357
httpGet:
58+
{{- if .Values.overrideRootPath}}
59+
path: {{ .Values.overrideRootPath }}/healthz
60+
{{- else}}
5461
path: /healthz
62+
{{- end}}
5563
port: {{ .Values.service.port }}
5664
failureThreshold: 3
5765
periodSeconds: 15
5866
successThreshold: 1
5967
startupProbe:
6068
httpGet:
69+
{{- if .Values.overrideRootPath}}
70+
path: {{ .Values.overrideRootPath }}/healthz
71+
{{- else}}
6172
path: /healthz
73+
{{- end}}
6274
port: {{ .Values.service.port }}
6375
# check every sec for 1 minute
6476
periodSeconds: 1

0 commit comments

Comments
 (0)