allow services to specify additional service annotations in values, allow for setting timeout on AWS load balancers

Author: batpad

osm-seed/templates/nominatim-api/nominatim-api-service.yaml

@@ -20,6 +20,9 @@ metadata:
     {{- else }}
     fake.annotation: fake
     {{- end }}
+    {{- with .Values.nominatimApi.serviceAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   type: {{ .Values.serviceType }}
   ports:

osm-seed/templates/overpass-api/overpass-api-service.yaml

@@ -20,6 +20,9 @@ metadata:
     {{- else }}
     fake.annotation: fake
     {{- end }}
+    {{- with .Values.overpassApi.serviceAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   type: {{ .Values.serviceType }}
   ports:

osm-seed/templates/taginfo/taginfo-service.yaml

@@ -20,6 +20,9 @@ metadata:
     {{- else }}
     fake.annotation: fake
     {{- end }}
+    {{- with .Values.taginfo.serviceAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   type: {{ .Values.serviceType }}
   ports:

osm-seed/templates/tasking-manager-api/tasking-manager-api-service.yaml

@@ -20,6 +20,9 @@ metadata:
     {{- else }}
     fake.annotation: fake
     {{- end }}
+    {{- with .Values.tmApi.serviceAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   type: {{ .Values.serviceType }}
   ports:

osm-seed/templates/tiler-server/tiler-server-service.yaml

@@ -20,6 +20,9 @@ metadata:
     {{- else }}
     fake.annotation: fake
     {{- end }}
+    {{- with .Values.tilerServer.serviceAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   type: {{ .Values.serviceType }}
   ports:

osm-seed/templates/web/web-service.yaml

@@ -20,6 +20,9 @@ metadata:
     {{- else }}
     fake.annotation: fake
     {{- end }}
+    {{- with .Values.web.serviceAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 
 spec:
   type: {{ .Values.serviceType }}

osm-seed/values.yaml

@@ -120,6 +120,7 @@ web:
     name: ''
     tag: ''
   replicaCount: 1
+  serviceAnnotations: {}
   env:
     MAILER_ADDRESS: smtp.gmail.com
     MAILER_DOMAIN: gmail.com
@@ -386,6 +387,7 @@ tilerServer:
     name: ''
     tag: ''
   replicaCount: 1
+  serviceAnnotations: {}
   env:
     TILER_SERVER_PORT: 9090
     TILER_CACHE_TYPE: s3 #In case TILER_CACHE_TYPE=s3, the kubernetes teemplate will come up with a deployment pod
@@ -478,6 +480,7 @@ tmApi:
   nodeSelector:
     enabled: false
   replicaCount: 1
+  serviceAnnotations: {}
   env:
     POSTGRES_HOST: 'tm'
     POSTGRES_DB: 'tm'
@@ -568,7 +571,8 @@ nominatimDb:
 # Variables for nominatim api
 # ====================================================================================================
 nominatimApi:
-  enabled: false
+  serviceAnnotations: {}
+  enabled: true
   replicaCount: 1
   env:
     BASE_URL: https://nominatim.osm-seed.test
@@ -593,6 +597,7 @@ overpassApi:
   image:
     name: ''
     tag: ''
+  serviceAnnotations: {}
   env:
     OVERPASS_META: 'yes'
     OVERPASS_MODE: init
@@ -632,6 +637,7 @@ taginfo:
   image:
     name: ''
     tag: ''
+  serviceAnnotations: {}
   env:
     URL_PLANET_FILE_STATE: https://planet.osm.org/pbf/state.txt
     URL_HISTORY_PLANET_FILE_STATE: https://planet.osm.org/pbf/full-history/state.txt
@@ -654,4 +660,4 @@ taginfo:
       memory: '2Gi'
       cpu: '2'
   nodeSelector:
-    enabled: false
+    enabled: false