Add config to redirect trafic to external service for nominatim api and ui

Author: Rub21

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

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

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

@@ -62,4 +62,4 @@ spec:
             port:
               number: 80
       {{- end }}
-{{- end }}
+{{- end }}

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

@@ -1,4 +1,4 @@
-{{- if .Values.nominatimApi.enabled -}}
+{{- if and .Values.nominatimApi.enabled (not .Values.nominatimApi.externalService.enabled) }}
 {{- if .Values.nominatimApi.persistenceDisk.enabled -}}
 apiVersion: v1
 kind: PersistentVolume
@@ -82,4 +82,4 @@ spec:
       storage: {{ .Values.nominatimApi.persistenceDisk.GCP_gcePersistentDisk_size }}
       {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}

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

@@ -24,16 +24,25 @@ metadata:
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
+  {{- if and .Values.nominatimApi.enabled .Values.nominatimApi.externalService.enabled }}
+  # External service (no selector)
+  ports:
+    - name: http
+      port: 80
+      targetPort: {{ .Values.nominatimApi.externalService.port | default "80" }} 
+      protocol: TCP
+  {{- else }}
+  # Internal service
   type: {{ .Values.serviceType }}
   ports:
     - port: 80
       protocol: TCP
       name: http
       targetPort: api
-    - port: 5432
-      protocol: TCP
-      name: postgres
-      targetPort: postgres
+    # - port: 5432
+    #   protocol: TCP
+    #   name: postgres
+    #   targetPort: postgres
   {{- if and (eq .Values.serviceType "LoadBalancer") .Values.AWS_SSL_ARN }}
     - port: 443
       protocol: TCP
@@ -44,6 +53,7 @@ spec:
     app: {{ template "osm-seed.name" . }}
     release: {{ .Release.Name }}
     run: {{ .Release.Name }}-nominatim
+  {{- end }}
 {{- end }}
 ---
 {{- if and .Values.nominatimApi.enabled .Values.nominatimUI.enabled }}
@@ -57,6 +67,15 @@ metadata:
     environment: {{ .Values.environment }}
     release: {{ .Release.Name }}
 spec:
+  {{- if and .Values.nominatimUI.enabled .Values.nominatimUI.externalService.enabled }}
+  # External service (no selector)
+  ports:
+    - name: http
+      port: 80
+      targetPort: {{ .Values.nominatimUI.externalService.port | default "80" }} 
+      protocol: TCP
+  {{- else }}
+  # Internal service
   type: ClusterIP
   ports:
     - port: 80
@@ -67,4 +86,5 @@ spec:
     app: {{ template "osm-seed.name" . }}
     release: {{ .Release.Name }}
     run: {{ .Release.Name }}-nominatim
+  {{- end }}
 {{- end }}

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

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