Merge branch 'develop' into cgmap

developmentseed · Jun 20, 2024 · 60810bf · 60810bf
2 parents 9a90c8a + 1719642
commit 60810bf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/images/overpass-api/Dockerfile b/images/overpass-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM wiktorn/overpass-api:latest
+FROM wiktorn/overpass-api:0.7.62
 COPY docker-entrypoint.sh /app/
 RUN chmod a+rx /app/docker-entrypoint.sh 
 CMD ["/app/docker-entrypoint.sh"]
diff --git a/osm-seed/templates/overpass-api/overpass-api-statefulset.yaml b/osm-seed/templates/overpass-api/overpass-api-statefulset.yaml
@@ -60,6 +60,8 @@ spec:
               value: {{ .Values.overpassApi.env.OVERPASS_PLANET_PREPROCESS | quote}}
             - name: OVERPASS_REPLICATION_SEQUENCE_NUMBER
               value: {{ .Values.overpassApi.env.OVERPASS_REPLICATION_SEQUENCE_NUMBER | quote }}
+            - name: OVERPASS_ALLOW_DUPLICATE_QUERIES
+              value: {{ .Values.overpassApi.env.OVERPASS_ALLOW_DUPLICATE_QUERIES | quote }}
           volumeMounts:
           - mountPath: /db
             name: overpass-api-storage

diff --git a/osm-seed/templates/web/web-ingress.yaml b/osm-seed/templates/web/web-ingress.yaml
@@ -7,6 +7,9 @@ metadata:
     kubernetes.io/ingress.class: nginx
     cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
     nginx.ingress.kubernetes.io/proxy-body-size: 100m
+    nginx.ingress.kubernetes.io/proxy-connect-timeout: "600"
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
+    nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
 spec:
   ingressClassName: nginx
   tls:

diff --git a/osm-seed/values.yaml b/osm-seed/values.yaml
@@ -655,6 +655,7 @@ overpassApi:
     OVERPASS_RULES_LOAD: 10
     OVERPASS_PLANET_PREPROCESS: 'mv /db/planet.osm.bz2 /db/planet.osm.pbf && osmium cat -o /db/planet.osm.bz2 /db/planet.osm.pbf && rm /db/planet.osm.pbf'
     OVERPASS_REPLICATION_SEQUENCE_NUMBER: 5201000
+    OVERPASS_ALLOW_DUPLICATE_QUERIES: "yes"
   persistenceDisk:
     enabled: false
     accessMode: ReadWriteOnce