From 171964288caeab5d2f2d7059cdedc9dc2d314634 Mon Sep 17 00:00:00 2001
From: "Ruben L. Mendoza" <rub2106@gmail.com>
Date: Thu, 20 Jun 2024 10:15:06 -0500
Subject: [PATCH] Update Overpass and Increase ingress proxy time value (#334)

* Update env var for overpass

* Update overpass image

* Add proxy read/sent api web

* Update ingress proxy read/sent=600
---
 images/overpass-api/Dockerfile                                | 2 +-
 osm-seed/templates/overpass-api/overpass-api-statefulset.yaml | 2 ++
 osm-seed/templates/web/web-ingress.yaml                       | 3 +++
 osm-seed/values.yaml                                          | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/images/overpass-api/Dockerfile b/images/overpass-api/Dockerfile
index de488a70..7f648b67 100644
--- 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
index 3b0e6af0..39c47ed6 100644
--- 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
index 44bebd3f..8b4067af 100644
--- 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
index 137a56ce..63637377 100644
--- 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