Skip to content

Commit 3525be9

Browse files
author
Rub21
committed
Templates for nominatim 4.0
1 parent e4009f3 commit 3525be9

File tree

7 files changed

+123
-212
lines changed

7 files changed

+123
-212
lines changed

‎chartpress.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ charts:
3333
# tiler-visor:
3434
# valuesPath: tilerVisor.image
3535
nominatim:
36-
valuesPath: nominatim.image
36+
valuesPath: nominatimApi.image
3737
overpass-api:
3838
valuesPath: overpassApi.image
3939
taginfo:

‎osm-seed/templates/nominatim-api/nominatim-api-deployment.yaml

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎osm-seed/templates/nominatim-db/nominatim-db-pd.yaml renamed to ‎osm-seed/templates/nominatim-api/nominatim-api-pd.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
{{- if .Values.nominatimDb.enabled -}}
2-
{{- if .Values.nominatimDb.persistenceDisk.enabled -}}
1+
{{- if .Values.nominatimApi.enabled -}}
2+
{{- if .Values.nominatimApi.persistenceDisk.enabled -}}
33
apiVersion: v1
44
kind: PersistentVolume
55
metadata:
66
name: {{ .Release.Name }}-nominatim-pv
77
labels:
88
app: {{ template "osm-seed.name" . }}
9-
component: nominatim-db-pd
9+
component: nominatim-api-pd
1010
environment: {{ .Values.environment }}
1111
release: {{ .Release.Name }}
1212
spec:
@@ -25,23 +25,23 @@ spec:
2525
{{- if eq .Values.cloudProvider "aws" }}
2626
storageClassName: ""
2727
capacity:
28-
storage: {{ .Values.nominatimDb.persistenceDisk.AWS_ElasticBlockStore_size }}
28+
storage: {{ .Values.nominatimApi.persistenceDisk.AWS_ElasticBlockStore_size }}
2929
accessModes:
3030
- ReadWriteOnce
3131
awsElasticBlockStore:
32-
volumeID: {{ .Values.nominatimDb.persistenceDisk.AWS_ElasticBlockStore_volumeID }}
32+
volumeID: {{ .Values.nominatimApi.persistenceDisk.AWS_ElasticBlockStore_volumeID }}
3333
fsType: ext4
3434
{{- end }}
3535

3636
############## GCP Provider ##############
3737
{{- if eq .Values.cloudProvider "gcp" }}
3838
storageClassName: ""
3939
capacity:
40-
storage: {{ .Values.nominatimDb.persistenceDisk.GCP_gcePersistentDisk_size }}
40+
storage: {{ .Values.nominatimApi.persistenceDisk.GCP_gcePersistentDisk_size }}
4141
accessModes:
4242
- ReadWriteOnce
4343
gcePersistentDisk:
44-
pdName: {{ .Values.nominatimDb.persistenceDisk.GCP_gcePersistentDisk_pdName}}
44+
pdName: {{ .Values.nominatimApi.persistenceDisk.GCP_gcePersistentDisk_pdName}}
4545
fsType: ext4
4646
{{- end }}
4747
---
@@ -51,7 +51,7 @@ metadata:
5151
name: {{ .Release.Name }}-nominatim-pv-claim
5252
labels:
5353
app: {{ template "osm-seed.name" . }}
54-
component: nominatim-db-pd
54+
component: nominatim-api-pd
5555
environment: {{ .Values.environment }}
5656
release: {{ .Release.Name }}
5757
spec:
@@ -69,17 +69,17 @@ spec:
6969
requests:
7070
############# Minikube ##############
7171
{{- if eq .Values.cloudProvider "minikube" }}
72-
storage: {{ .Values.nominatimDb.persistenceDisk.localVolumeSize }}
72+
storage: {{ .Values.nominatimApi.persistenceDisk.localVolumeSize }}
7373
{{- end }}
7474

7575
############## AWS Provider ##############
7676
{{- if eq .Values.cloudProvider "aws" }}
77-
storage: {{ .Values.nominatimDb.persistenceDisk.AWS_ElasticBlockStore_size }}
77+
storage: {{ .Values.nominatimApi.persistenceDisk.AWS_ElasticBlockStore_size }}
7878
{{- end }}
7979

8080
############## GCP Provider ##############
8181
{{- if eq .Values.cloudProvider "gcp" }}
82-
storage: {{ .Values.nominatimDb.persistenceDisk.GCP_gcePersistentDisk_size }}
82+
storage: {{ .Values.nominatimApi.persistenceDisk.GCP_gcePersistentDisk_size }}
8383
{{- end }}
8484
{{- end }}
8585
{{- end }}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ spec:
3030
targetPort: http
3131
protocol: TCP
3232
name: http
33+
targetPort: apache
3334
{{- if and (eq .Values.serviceType "LoadBalancer") .Values.AWS_SSL_ARN }}
3435
- port: 443
3536
targetPort: http

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

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
{{- if .Values.nominatimApi.enabled -}}
2+
apiVersion: apps/v1
3+
kind: StatefulSet
4+
metadata:
5+
name: {{ .Release.Name }}-nominatim-api
6+
labels:
7+
app: {{ template "osm-seed.name" . }}
8+
component: nominatim-api-statefulset
9+
environment: {{ .Values.environment }}
10+
release: {{ .Release.Name }}
11+
spec:
12+
replicas: 1 # we only ever want one replica of the nominatimApi
13+
selector:
14+
matchLabels:
15+
app: {{ template "osm-seed.name" . }}
16+
release: {{ .Release.Name }}
17+
run: {{ .Release.Name }}-nominatim-api
18+
serviceName: {{ .Release.Name }}-nominatim-api
19+
template:
20+
metadata:
21+
labels:
22+
app: {{ template "osm-seed.name" . }}
23+
release: {{ .Release.Name }}
24+
run: {{ .Release.Name }}-nominatim-api
25+
spec:
26+
containers:
27+
- name: {{ .Chart.Name }}-nominatim-api
28+
image: "{{ .Values.nominatimApi.image.name }}:{{ .Values.nominatimApi.image.tag }}"
29+
ports:
30+
- name: postgres
31+
containerPort: 5432
32+
protocol: TCP
33+
- name: apache
34+
containerPort: 8080
35+
protocol: TCP
36+
env:
37+
- name: PBF_URL
38+
value: {{ .Values.nominatimApi.env.PBF_URL }}
39+
- name: REPLICATION_URL
40+
value: {{ .Values.nominatimApi.env.REPLICATION_URL }}
41+
- name: REPLICATION_UPDATE_INTERVAL
42+
value: {{ .Values.nominatimApi.env.REPLICATION_UPDATE_INTERVAL | quote}}
43+
- name: REPLICATION_RECHECK_INTERVAL
44+
value: {{ .Values.nominatimApi.env.REPLICATION_RECHECK_INTERVAL | quote}}
45+
- name: THREADS
46+
value: {{ .Values.nominatimApi.env.THREADS | quote}}
47+
- name: FREEZE
48+
value: {{ .Values.nominatimApi.env.FREEZE | quote}}
49+
- name: IMPORT_WIKIPEDIA
50+
value: {{ .Values.nominatimApi.env.IMPORT_WIKIPEDIA | quote}}
51+
- name: IMPORT_US_POSTCODES
52+
value: {{ .Values.nominatimApi.env.IMPORT_US_POSTCODES | quote}}
53+
- name: IMPORT_GB_POSTCODES
54+
value: {{ .Values.nominatimApi.env.IMPORT_GB_POSTCODES | quote}}
55+
- name: IMPORT_TIGER_ADDRESSES
56+
value: {{ .Values.nominatimApi.env.IMPORT_TIGER_ADDRESSES | quote}}
57+
- name: NOMINATIM_PASSWORD
58+
value: {{ .Values.nominatimApi.env.NOMINATIM_PASSWORD | quote}}
59+
- name: PGDATA
60+
value: {{ .Values.nominatimApi.persistenceDisk.mountPath }}
61+
- name: OSMSEED_WEB_API_DOMAIN
62+
value: {{ .Values.nominatimApi.env.OSMSEED_WEB_API_DOMAIN }}
63+
- name: OSMSEED_OVERPASS_API_DOMAIN
64+
value: {{ .Values.nominatimApi.env.OSMSEED_OVERPASS_API_DOMAIN }}
65+
# command: ["/bin/sh"]
66+
# args: ["-c", "sh /app/start.sh"]
67+
# livenessProbe:
68+
# exec:
69+
# command:
70+
# - sh
71+
# - -c
72+
# - exec pg_isready --host $POD_IP
73+
# initialDelaySeconds: 120
74+
# timeoutSeconds: 5
75+
# failureThreshold: 6
76+
# readinessProbe:
77+
# exec:
78+
# command:
79+
# - sh
80+
# - -c
81+
# - exec pg_isready --host $POD_IP
82+
# initialDelaySeconds: 5
83+
# timeoutSeconds: 3
84+
# periodSeconds: 5
85+
volumeMounts:
86+
- name: nominatim-db-storage
87+
mountPath: {{ .Values.nominatimApi.persistenceDisk.mountPath }}
88+
subPath: {{ .Values.nominatimApi.persistenceDisk.subPath }}
89+
{{- if .Values.nominatimApi.resources.enabled }}
90+
resources:
91+
requests:
92+
memory: {{ .Values.nominatimApi.resources.requests.memory }}
93+
cpu: {{ .Values.nominatimApi.resources.requests.cpu }}
94+
limits:
95+
memory: {{ .Values.nominatimApi.resources.limits.memory }}
96+
cpu: {{ .Values.nominatimApi.resources.limits.cpu }}
97+
{{- end }}
98+
volumes:
99+
- name: nominatim-db-storage
100+
{{- if .Values.nominatimApi.persistenceDisk.enabled }}
101+
persistentVolumeClaim:
102+
claimName: {{ .Release.Name }}-nominatim-pv-claim
103+
{{- else }}
104+
emptyDir: {}
105+
{{- end }}
106+
{{- if .Values.nominatimApi.nodeSelector.enabled }}
107+
nodeSelector:
108+
{{ .Values.nominatimApi.nodeSelector.label_key }} : {{ .Values.nominatimApi.nodeSelector.label_value }}
109+
{{- end }}
110+
{{- end }}

‎osm-seed/templates/nominatim-db/nominatim-db-service.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)