Skip to content

Commit 576f1e7

Browse files
committed
Merge branch 'main' into feature/extend-public-services
2 parents 591f62b + e459c4f commit 576f1e7

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ spec:
4343
---
4444
{{/* END: if index $v "autoscaling" "enabled" */}}
4545
{{- end }}
46-
{{/* END: range $serviceName, $v := .Values*/}}
46+
{{/* END: range $serviceName, $v := .Values.apiServices */}}
4747
{{- end }}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ spec:
4040
rules:
4141
- http:
4242
paths:
43-
{{- range $serviceName, $v := .Values }}
44-
{{- if (or (eq $serviceName "raster") (eq $serviceName "stac") (eq $serviceName "vector")) }}
43+
{{- range $serviceName $.Values.apiServices }}
4544
{{- if (and (index $v "enabled") (not $.Values.testing)) }}
4645
- pathType: Prefix
4746
path: "/{{ $serviceName }}"
@@ -59,8 +58,7 @@ spec:
5958
port:
6059
number: {{ $.Values.service.port }}
6160
{{- end }}{{/* END: if index $v "enabled" */}}
62-
{{- end }}{{/* END: if (or (eq $serviceName "raster") (eq $serviceName "stac") (eq $serviceName "vector")) */}}
63-
{{- end }}{{/* END: range $serviceName, $v := .Values*/}}
61+
{{- end }}{{/* END: range $serviceName, $v := $.Values.apiServices */}}
6462
{{- if (and (not $.Values.testing) (.Values.docServer.enabled)) }}
6563
- pathType: Prefix
6664
path: /(/|$)

helm-chart/eoapi/values.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ pgstacBootstrap:
170170
######################
171171
# API SERVICES
172172
######################
173-
174173
apiServices:
175174
raster:
176175
enabled: true

0 commit comments

Comments
 (0)