From 3c9f638070bf73bae3683e4a55a4ee6919824a87 Mon Sep 17 00:00:00 2001
From: Rub21 <rub2106@gmail.com>
Date: Fri, 6 Dec 2024 17:57:41 -0500
Subject: [PATCH] Update config map for tiler seed an purge

---
 images/tiler-cache/Dockerfile                  |  2 +-
 ohm/requirements.yaml                          |  2 +-
 .../tiler-cache-purge/deployment.yaml          |  6 ++++--
 ohm/templates/tiler-cache-seed/cronjob.yaml    |  6 ++++--
 values.staging.template.yaml                   | 18 +++++++++---------
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/images/tiler-cache/Dockerfile b/images/tiler-cache/Dockerfile
index 9d6d14b6..3f1cd7ab 100644
--- a/images/tiler-cache/Dockerfile
+++ b/images/tiler-cache/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.1855.h6f536f6
+FROM ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.1859.h75499f5
 
 RUN apk update && apk add --no-cache \
     proj \
diff --git a/ohm/requirements.yaml b/ohm/requirements.yaml
index daeaff2d..99e4ebaf 100644
--- a/ohm/requirements.yaml
+++ b/ohm/requirements.yaml
@@ -1,4 +1,4 @@
 dependencies:
   - name: osm-seed
-    version: '0.1.0-n805.h7b1713f'
+    version: '0.1.0-n810.h19d0f7b'
     repository: https://devseed.com/osm-seed-chart/
diff --git a/ohm/templates/tiler-cache-purge/deployment.yaml b/ohm/templates/tiler-cache-purge/deployment.yaml
index 4bfed08a..9d2c28b2 100644
--- a/ohm/templates/tiler-cache-purge/deployment.yaml
+++ b/ohm/templates/tiler-cache-purge/deployment.yaml
@@ -72,8 +72,10 @@ spec:
             - name: S3_BUCKET_PATH_FILES
               value: {{ .Values.ohm.tilerCachePurge.env.S3_BUCKET_PATH_FILES | quote }}
           envFrom:
-            - configMapRef:
-                name: {{ .Release.Name }}-tiler-server-cm
+          - configMapRef:
+              name: {{ .Release.Name }}-tiler-server-cm
+           - configMapRef:
+              name: {{ .Release.Name }}-tiler-db-cm
           {{- if .Values.ohm.tilerCachePurge.resources.enabled }}
           resources:
             requests:
diff --git a/ohm/templates/tiler-cache-seed/cronjob.yaml b/ohm/templates/tiler-cache-seed/cronjob.yaml
index e63f0e03..df586fe5 100644
--- a/ohm/templates/tiler-cache-seed/cronjob.yaml
+++ b/ohm/templates/tiler-cache-seed/cronjob.yaml
@@ -62,8 +62,10 @@ spec:
                 - name: OUTPUT_FILE
                   value: {{ .Values.ohm.tilerCacheSeed.env.OUTPUT_FILE | quote }}
               envFrom:
-                - configMapRef:
-                    name: {{ .Release.Name }}-tiler-server-cm
+              - configMapRef:
+                  name: {{ .Release.Name }}-tiler-server-cm
+              - configMapRef:
+                  name: {{ .Release.Name }}-tiler-db-cm
           restartPolicy: OnFailure
       backoffLimit: 3
 {{- end }}
\ No newline at end of file
diff --git a/values.staging.template.yaml b/values.staging.template.yaml
index be38ec2f..9e9b8498 100644
--- a/values.staging.template.yaml
+++ b/values.staging.template.yaml
@@ -385,7 +385,7 @@ osm-seed:
     tilerDb:
       enabled: true
       useExternalHost: # When we are using useExternalHost.enabled= true other variables are giong to be disable ans use the external host config
-        enabled: true
+        enabled: false
       env:
         POSTGRES_HOST: {{STAGING_TILER_DB_HOST}}
         POSTGRES_DB: tiler_osm_staging
@@ -412,7 +412,7 @@ osm-seed:
       nodeSelector:
         enabled: true
         label_key: nodegroup_type
-        label_value: job_xlarge
+        label_value: db_large
       postgresqlConfig:
         enabled: true
         values: |
@@ -481,10 +481,6 @@ osm-seed:
   
     tilerImposm:
       enabled: true
-      nodeSelector:
-        enabled: true
-        label_key: nodegroup_type
-        label_value: web_large
       env:
         TILER_IMPORT_FROM: osm
         TILER_IMPORT_PBF_URL: https://s3.amazonaws.com/planet.openhistoricalmap.org/planet/planet-241202_0001.osm.pbf
@@ -510,6 +506,10 @@ osm-seed:
         limits:
           memory: "24Gi"
           cpu: "10"
+      nodeSelector:
+        enabled: true
+        label_key: nodegroup_type
+        label_value: web_large
     # ====================================================================================================
     # Variables for tiler-server
     # ====================================================================================================
@@ -962,11 +962,11 @@ ohm:
     enabled: true
     
   tilerCachePurge:
-    enabled: false
+    enabled: true
     env:
       REGION_NAME: us-east-1
       NAMESPACE: default # Namespace to run the job
-      DOCKER_IMAGE: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.1791.h27fbedb # TODO, this should be automatically updated from tiler server image
+      DOCKER_IMAGE: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.1859.h75499f5 # TODO, this should be automatically updated from tiler server image
       SQS_QUEUE_URL: {{STAGING_SQS_QUEUE_URL}}
       NODEGROUP_TYPE: web_large # Nodegroup type to run the job
       MAX_ACTIVE_JOBS: 2 # Maximum number of active jobs in high concurrency queue
@@ -1001,7 +1001,7 @@ ohm:
     schedule: '* * * * *'
     env:
       GEOJSON_URL: https://osmseed-dev.s3.us-east-1.amazonaws.com/tiler/wold-usa-eu.geojson
-      ZOOM_LEVELS: '7,8,9,10'
+      ZOOM_LEVELS: '7'
       CONCURRENCY: 64
       S3_BUCKET: osmseed-dev
       OUTPUT_FILE: /logs/tiler_benchmark.log