Add config to redirect trafic to external service for overpass-api

Author: Rub21

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

@@ -1,4 +1,4 @@
-{{- if .Values.overpassApi.enabled -}}
+{{- if and .Values.overpassApi.enabled (not .Values.overpassApi.externalService.enabled) }}
 {{- if .Values.overpassApi.persistenceDisk.enabled -}}
 apiVersion: v1
 kind: PersistentVolume

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

@@ -0,0 +1,19 @@
+{{- if and .Values.overpassApi.enabled .Values.overpassApi.externalService.enabled }}
+apiVersion: v1
+kind: Endpoints
+metadata:
+  name: {{ .Release.Name }}-overpass-api
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ template "osm-seed.name" . }}
+    component: overpass-api-endpoints
+    environment: {{ .Values.environment }}
+    release: {{ .Release.Name }}
+subsets:
+  - addresses:
+      - ip: {{ .Values.overpassApi.externalService.ip }}
+    ports:
+      - name: http
+        port: {{ .Values.overpassApi.externalService.port }}
+        protocol: TCP
+{{- end }}

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

@@ -28,7 +28,7 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: {{ template "osm-seed.fullname" . }}-overpass-api
+            name: {{ .Release.Name }}-overpass-api
             port:
               number: 80
-{{- end }}
+{{- end }}

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

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "osm-seed.fullname" . }}-overpass-api
+  name: {{ .Release.Name }}-overpass-api
   labels:
     app: {{ template "osm-seed.name" . }}
     component: overpass-api-service
@@ -24,6 +24,15 @@ metadata:
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
+  {{- if and .Values.overpassApi.enabled .Values.overpassApi.externalService.enabled }}
+  # External service (no selector)
+  ports:
+    - name: http
+      port: 80
+      targetPort: {{ .Values.overpassApi.externalService.port | default "80" }} 
+      protocol: TCP
+  {{- else }}
+  # Internal service
   type: {{ .Values.serviceType }}
   ports:
     - port: 80
@@ -36,9 +45,9 @@ spec:
       protocol: TCP
       name: https
   {{- end }}
-  
   selector:
     app: {{ template "osm-seed.name" . }}
     release: {{ .Release.Name }}
     run: {{ .Release.Name }}-overpass-api
-{{- end }}
+  {{- end }}
+{{- end }}

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

@@ -1,4 +1,4 @@
-{{- if .Values.overpassApi.enabled -}}
+{{- if and .Values.overpassApi.enabled (not .Values.overpassApi.externalService.enabled) }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:

osm-seed/values.yaml

@@ -810,6 +810,10 @@ nominatimApi:
 # ====================================================================================================
 overpassApi:
   enabled: false
+  externalService:
+    enabled: true
+    ip: "37.1.1.5"
+    port: 9090
   image:
     name: ""
     tag: ""