From b7799d4c58471a4dc4dd6057330f6c5c77d866fd Mon Sep 17 00:00:00 2001
From: Rub21 <rub2106@gmail.com>
Date: Fri, 29 Nov 2024 08:15:07 -0500
Subject: [PATCH] Add env vars for tiler server

---
 .../tiler-server/tiler-server-configMap.yaml  | 32 ++++++++++---------
 .../tiler-server/tiler-server-deployment.yaml |  2 +-
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/osm-seed/templates/tiler-server/tiler-server-configMap.yaml b/osm-seed/templates/tiler-server/tiler-server-configMap.yaml
index b23dcaa7..9427bd30 100644
--- a/osm-seed/templates/tiler-server/tiler-server-configMap.yaml
+++ b/osm-seed/templates/tiler-server/tiler-server-configMap.yaml
@@ -5,23 +5,25 @@ metadata:
   name: {{ .Release.Name }}-tiler-server-cm
 data:
     POSTGRES_HOST: {{ .Release.Name }}-tiler-db
-    POSTGRES_DB: {{ quote .Values.tilerDb.env.POSTGRES_DB }}
-    POSTGRES_PASSWORD: {{ quote .Values.tilerDb.env.POSTGRES_PASSWORD }}
-    POSTGRES_USER: {{ quote .Values.tilerDb.env.POSTGRES_USER }}
-    POSTGRES_PORT: {{ quote .Values.tilerDb.env.POSTGRES_PORT }}
-    TILER_SERVER_PORT: {{ quote .Values.tilerServer.env.TILER_SERVER_PORT }}
-    TILER_CACHE_TYPE: {{ quote .Values.tilerServer.env.TILER_CACHE_TYPE }}
-    TILER_CACHE_REGION: {{ quote .Values.tilerServer.env.TILER_CACHE_REGION }}
-    TILER_CACHE_BUCKET: {{ quote .Values.tilerServer.env.TILER_CACHE_BUCKET }}
-    TILER_CACHE_BASEPATH: {{ quote .Values.tilerServer.env.TILER_CACHE_BASEPATH }}
-    TILER_CACHE_AWS_ACCESS_KEY_ID: {{ quote .Values.tilerServer.env.TILER_CACHE_AWS_ACCESS_KEY_ID }}
-    TILER_CACHE_AWS_SECRET_ACCESS_KEY: {{ quote .Values.tilerServer.env.TILER_CACHE_AWS_SECRET_ACCESS_KEY }}
-    TILER_CACHE_MAX_ZOOM: {{ quote .Values.tilerServer.env.TILER_CACHE_MAX_ZOOM }}
-    CLOUDPROVIDER: {{ quote .Values.cloudProvider }}
+    POSTGRES_DB: {{ .Values.tilerDb.env.POSTGRES_DB | quote }}
+    POSTGRES_PASSWORD: {{ .Values.tilerDb.env.POSTGRES_PASSWORD | quote }}
+    POSTGRES_USER: {{ .Values.tilerDb.env.POSTGRES_USER | quote }}
+    POSTGRES_PORT: {{ .Values.tilerDb.env.POSTGRES_PORT | quote }}
+    TILER_SERVER_PORT: {{ .Values.tilerServer.env.TILER_SERVER_PORT | quote }}
+    TILER_CACHE_TYPE: {{ .Values.tilerServer.env.TILER_CACHE_TYPE | quote }}
+    TILER_CACHE_REGION: {{ .Values.tilerServer.env.TILER_CACHE_REGION | quote }}
+    TILER_CACHE_BUCKET: {{ .Values.tilerServer.env.TILER_CACHE_BUCKET | quote }}
+    TILER_CACHE_BASEPATH: {{ .Values.tilerServer.env.TILER_CACHE_BASEPATH | quote }}
+    TILER_CACHE_AWS_ACCESS_KEY_ID: {{ .Values.tilerServer.env.TILER_CACHE_AWS_ACCESS_KEY_ID | quote }}
+    TILER_CACHE_AWS_SECRET_ACCESS_KEY: {{ .Values.tilerServer.env.TILER_CACHE_AWS_SECRET_ACCESS_KEY | quote }}
+    TILER_CACHE_MAX_ZOOM: {{ .Values.tilerServer.env.TILER_CACHE_MAX_ZOOM | quote }}
+    EXECUTE_REINDEX: {{ .Values.tilerServer.env.EXECUTE_REINDEX | quote }}
+    EXECUTE_VACUUM_ANALYZE: {{ .Values.tilerServer.env.EXECUTE_VACUUM_ANALYZE | quote }}
+    CLOUDPROVIDER: {{ .Values.cloudProvider | quote }}
     {{- if eq .Values.cloudProvider "aws" }}
-    AWS_S3_BUCKET: {{ quote .Values.AWS_S3_BUCKET }}
+    AWS_S3_BUCKET: {{ .Values.AWS_S3_BUCKET | quote }}
     {{- end }}
     {{- if eq .Values.cloudProvider "gcp" }}
-    GCP_STORAGE_BUCKET: {{ quote .Values.GCP_STORAGE_BUCKET }}
+    GCP_STORAGE_BUCKET: {{ .Values.GCP_STORAGE_BUCKET | quote }}
     {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/osm-seed/templates/tiler-server/tiler-server-deployment.yaml b/osm-seed/templates/tiler-server/tiler-server-deployment.yaml
index 604b3515..bc7641c2 100644
--- a/osm-seed/templates/tiler-server/tiler-server-deployment.yaml
+++ b/osm-seed/templates/tiler-server/tiler-server-deployment.yaml
@@ -35,7 +35,7 @@ spec:
             httpGet:
               path: /
               port: {{ .Values.tilerServer.env.TILER_SERVER_PORT }}
-            initialDelaySeconds: 1000
+            initialDelaySeconds: 1500
             timeoutSeconds: 30
           {{- if .Values.tilerServer.resources.enabled }}
           resources: