From 10eca67cc345a4de299784e9943d40be03b49e04 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Fri, 15 Nov 2024 09:40:25 -0500 Subject: [PATCH 01/10] Increase initialDelaySeconds for tiler db deployment --- osm-seed/templates/tiler-server/tiler-server-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osm-seed/templates/tiler-server/tiler-server-deployment.yaml b/osm-seed/templates/tiler-server/tiler-server-deployment.yaml index 3c99bfc3..65a474f9 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: 600 # 10 min, because the compile process takes time. + initialDelaySeconds: 1000 timeoutSeconds: 30 {{- if .Values.tilerServer.resources.enabled }} resources: From 8669f203a0c0a4eb4183bcfbff1b4217c8fe90e6 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Fri, 15 Nov 2024 11:19:36 -0500 Subject: [PATCH 02/10] Add configmap for tiler server --- ...tiler-server-cache-cleaner-deployment.yaml | 50 ++----------------- .../tiler-server/tiler-server-configMap.yaml | 27 ++++++++++ .../tiler-server/tiler-server-deployment.yaml | 47 +++-------------- 3 files changed, 36 insertions(+), 88 deletions(-) create mode 100644 osm-seed/templates/tiler-server/tiler-server-configMap.yaml diff --git a/osm-seed/templates/tiler-server/tiler-server-cache-cleaner-deployment.yaml b/osm-seed/templates/tiler-server/tiler-server-cache-cleaner-deployment.yaml index f6e7995d..285715da 100644 --- a/osm-seed/templates/tiler-server/tiler-server-cache-cleaner-deployment.yaml +++ b/osm-seed/templates/tiler-server/tiler-server-cache-cleaner-deployment.yaml @@ -33,53 +33,9 @@ spec: memory: {{ .Values.tilerServerCacheCleaner.resources.limits.memory }} cpu: {{ .Values.tilerServerCacheCleaner.resources.limits.cpu }} {{- end }} - env: - # tiler-db env variables - - name: POSTGRES_HOST - value: {{ .Release.Name }}-tiler-db - - name: POSTGRES_DB - value: {{ .Values.tilerDb.env.POSTGRES_DB }} - - name: POSTGRES_PASSWORD - value: {{ quote .Values.tilerDb.env.POSTGRES_PASSWORD }} - - name: POSTGRES_USER - value: {{ .Values.tilerDb.env.POSTGRES_USER }} - - name: POSTGRES_PORT - value: {{ .Values.tilerDb.env.POSTGRES_PORT | quote }} - # tiler-server env variables - - name: TILER_SERVER_PORT - value: {{ .Values.tilerServer.env.TILER_SERVER_PORT | quote }} - - name: TILER_CACHE_TYPE - value: {{ .Values.tilerServer.env.TILER_CACHE_TYPE }} - - name: TILER_CACHE_REGION - value: {{ .Values.tilerServer.env.TILER_CACHE_REGION }} - - name: TILER_CACHE_BUCKET - value: {{ .Values.tilerServer.env.TILER_CACHE_BUCKET }} - - name: TILER_CACHE_BASEPATH - value: {{ quote .Values.tilerServer.env.TILER_CACHE_BASEPATH }} - - name: TILER_CACHE_AWS_ACCESS_KEY_ID - value: {{ quote .Values.tilerServer.env.TILER_CACHE_AWS_ACCESS_KEY_ID }} - - name: TILER_CACHE_AWS_SECRET_ACCESS_KEY - value: {{ quote .Values.tilerServer.env.TILER_CACHE_AWS_SECRET_ACCESS_KEY }} - - name: TILER_CACHE_MAX_ZOOM - value: {{ quote .Values.tilerServer.env.TILER_CACHE_MAX_ZOOM }} - - name: MAX_NUM_PS - value: {{ quote .Values.tilerServerCacheCleaner.env.MAX_NUM_PS }} - - name: PROCESS_NAME - value: {{ .Values.tilerServerCacheCleaner.env.PROCESS_NAME }} - - name: KILL_PROCESS - value: {{ .Values.tilerServerCacheCleaner.env.KILL_PROCESS }} - - name: CLOUDPROVIDER - value: {{ .Values.cloudProvider }} - # In case cloudProvider=aws - {{- if eq .Values.cloudProvider "aws" }} - - name: AWS_S3_BUCKET - value: {{ .Values.AWS_S3_BUCKET }} - {{- end }} - # In case cloudProvider=gcp - {{- if eq .Values.cloudProvider "gcp" }} - - name: GCP_STORAGE_BUCKET - value: {{ .Values.GCP_STORAGE_BUCKET }} - {{- end }} + envFrom: + - configMapRef: + name: {{ .Release.Name }}-tiler-server-cm {{- if .Values.tilerServerCacheCleaner.nodeSelector.enabled }} nodeSelector: {{ .Values.tilerServerCacheCleaner.nodeSelector.label_key }} : {{ .Values.tilerServerCacheCleaner.nodeSelector.label_value }} diff --git a/osm-seed/templates/tiler-server/tiler-server-configMap.yaml b/osm-seed/templates/tiler-server/tiler-server-configMap.yaml new file mode 100644 index 00000000..b23dcaa7 --- /dev/null +++ b/osm-seed/templates/tiler-server/tiler-server-configMap.yaml @@ -0,0 +1,27 @@ +{{- if .Values.tilerServer.enabled -}} +apiVersion: v1 +kind: ConfigMap +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 }} + {{- if eq .Values.cloudProvider "aws" }} + AWS_S3_BUCKET: {{ quote .Values.AWS_S3_BUCKET }} + {{- end }} + {{- if eq .Values.cloudProvider "gcp" }} + GCP_STORAGE_BUCKET: {{ quote .Values.GCP_STORAGE_BUCKET }} + {{- 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 65a474f9..6758552c 100644 --- a/osm-seed/templates/tiler-server/tiler-server-deployment.yaml +++ b/osm-seed/templates/tiler-server/tiler-server-deployment.yaml @@ -31,6 +31,9 @@ spec: - name: http containerPort: {{ .Values.tilerServer.env.TILER_SERVER_PORT }} protocol: TCP + - name: prometheus + containerPort: 9091 + protocol: TCP livenessProbe: httpGet: path: / @@ -46,47 +49,9 @@ spec: memory: {{ .Values.tilerServer.resources.limits.memory }} cpu: {{ .Values.tilerServer.resources.limits.cpu }} {{- end }} - env: - # tiler-db env variables - - name: POSTGRES_HOST - value: {{ .Release.Name }}-tiler-db - - name: POSTGRES_DB - value: {{ .Values.tilerDb.env.POSTGRES_DB }} - - name: POSTGRES_PASSWORD - value: {{ quote .Values.tilerDb.env.POSTGRES_PASSWORD }} - - name: POSTGRES_USER - value: {{ .Values.tilerDb.env.POSTGRES_USER }} - - name: POSTGRES_PORT - value: {{ .Values.tilerDb.env.POSTGRES_PORT | quote }} - # tiler-server env variables - - name: TILER_SERVER_PORT - value: {{ .Values.tilerServer.env.TILER_SERVER_PORT | quote }} - - name: TILER_CACHE_TYPE - value: {{ .Values.tilerServer.env.TILER_CACHE_TYPE }} - - name: TILER_CACHE_REGION - value: {{ .Values.tilerServer.env.TILER_CACHE_REGION }} - - name: TILER_CACHE_BUCKET - value: {{ .Values.tilerServer.env.TILER_CACHE_BUCKET }} - - name: TILER_CACHE_BASEPATH - value: {{ quote .Values.tilerServer.env.TILER_CACHE_BASEPATH }} - - name: TILER_CACHE_AWS_ACCESS_KEY_ID - value: {{ quote .Values.tilerServer.env.TILER_CACHE_AWS_ACCESS_KEY_ID }} - - name: TILER_CACHE_AWS_SECRET_ACCESS_KEY - value: {{ quote .Values.tilerServer.env.TILER_CACHE_AWS_SECRET_ACCESS_KEY }} - - name: TILER_CACHE_MAX_ZOOM - value: {{ quote .Values.tilerServer.env.TILER_CACHE_MAX_ZOOM }} - - name: CLOUDPROVIDER - value: {{ .Values.cloudProvider }} - # In case cloudProvider=aws - {{- if eq .Values.cloudProvider "aws" }} - - name: AWS_S3_BUCKET - value: {{ .Values.AWS_S3_BUCKET }} - {{- end }} - # In case cloudProvider=gcp - {{- if eq .Values.cloudProvider "gcp" }} - - name: GCP_STORAGE_BUCKET - value: {{ .Values.GCP_STORAGE_BUCKET }} - {{- end }} + envFrom: + - configMapRef: + name: {{ .Release.Name }}-tiler-server-cm {{- if .Values.tilerServer.nodeSelector.enabled }} nodeSelector: {{ .Values.tilerServer.nodeSelector.label_key }} : {{ .Values.tilerServer.nodeSelector.label_value }} From 3922b6bf5583128949cb7c0963a51ab465783870 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Fri, 15 Nov 2024 11:25:33 -0500 Subject: [PATCH 03/10] Add service for prometheus - tiler server --- .../tiler-server/tiler-server-service.yaml | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/osm-seed/templates/tiler-server/tiler-server-service.yaml b/osm-seed/templates/tiler-server/tiler-server-service.yaml index 4ec5ba09..be6a8fa8 100644 --- a/osm-seed/templates/tiler-server/tiler-server-service.yaml +++ b/osm-seed/templates/tiler-server/tiler-server-service.yaml @@ -12,7 +12,7 @@ metadata: {{- if and (eq .Values.serviceType "LoadBalancer") .Values.AWS_SSL_ARN }} service.beta.kubernetes.io/aws-load-balancer-ssl-cert: {{ .Values.AWS_SSL_ARN }} service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http - service.beta.kubernetes.io/aws-load-balancer-ssl-ports: https + service.beta.kubernetes.io/aws-load-balancer-ssl-ports: https {{- end }} {{- if eq .Values.serviceType "ClusterIP" }} kubernetes.io/ingress.class: nginx @@ -30,13 +30,32 @@ spec: targetPort: http protocol: TCP name: http - {{- if and (eq .Values.serviceType "LoadBalancer") .Values.AWS_SSL_ARN }} + {{- if and (eq .Values.serviceType "LoadBalancer") .Values.AWS_SSL_ARN }} - port: 443 targetPort: http protocol: TCP name: https - {{- end }} - + {{- end }} + selector: + app: {{ template "osm-seed.name" . }} + release: {{ .Release.Name }} + run: {{ .Release.Name }}-tiler-server +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ .Release.Name }}-tiler-server-prometheus + labels: + app: {{ template "osm-seed.name" . }} + component: tiler-server-prometheus-service + release: {{ .Release.Name }} +spec: + type: {{ .Values.tilerServer.prometheus.serviceType | default "ClusterIP" }} + ports: + - name: prometheus + port: 9091 + targetPort: prometheus + protocol: TCP selector: app: {{ template "osm-seed.name" . }} release: {{ .Release.Name }} From 2906caad511465bb875e53a75a1777dde571ab87 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Fri, 15 Nov 2024 11:33:07 -0500 Subject: [PATCH 04/10] Remove service for prometheus - tiler server --- .../tiler-server/tiler-server-deployment.yaml | 3 --- .../tiler-server/tiler-server-service.yaml | 27 +++---------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/osm-seed/templates/tiler-server/tiler-server-deployment.yaml b/osm-seed/templates/tiler-server/tiler-server-deployment.yaml index 6758552c..604b3515 100644 --- a/osm-seed/templates/tiler-server/tiler-server-deployment.yaml +++ b/osm-seed/templates/tiler-server/tiler-server-deployment.yaml @@ -31,9 +31,6 @@ spec: - name: http containerPort: {{ .Values.tilerServer.env.TILER_SERVER_PORT }} protocol: TCP - - name: prometheus - containerPort: 9091 - protocol: TCP livenessProbe: httpGet: path: / diff --git a/osm-seed/templates/tiler-server/tiler-server-service.yaml b/osm-seed/templates/tiler-server/tiler-server-service.yaml index be6a8fa8..4ec5ba09 100644 --- a/osm-seed/templates/tiler-server/tiler-server-service.yaml +++ b/osm-seed/templates/tiler-server/tiler-server-service.yaml @@ -12,7 +12,7 @@ metadata: {{- if and (eq .Values.serviceType "LoadBalancer") .Values.AWS_SSL_ARN }} service.beta.kubernetes.io/aws-load-balancer-ssl-cert: {{ .Values.AWS_SSL_ARN }} service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http - service.beta.kubernetes.io/aws-load-balancer-ssl-ports: https + service.beta.kubernetes.io/aws-load-balancer-ssl-ports: https {{- end }} {{- if eq .Values.serviceType "ClusterIP" }} kubernetes.io/ingress.class: nginx @@ -30,32 +30,13 @@ spec: targetPort: http protocol: TCP name: http - {{- if and (eq .Values.serviceType "LoadBalancer") .Values.AWS_SSL_ARN }} + {{- if and (eq .Values.serviceType "LoadBalancer") .Values.AWS_SSL_ARN }} - port: 443 targetPort: http protocol: TCP name: https - {{- end }} - selector: - app: {{ template "osm-seed.name" . }} - release: {{ .Release.Name }} - run: {{ .Release.Name }}-tiler-server ---- -apiVersion: v1 -kind: Service -metadata: - name: {{ .Release.Name }}-tiler-server-prometheus - labels: - app: {{ template "osm-seed.name" . }} - component: tiler-server-prometheus-service - release: {{ .Release.Name }} -spec: - type: {{ .Values.tilerServer.prometheus.serviceType | default "ClusterIP" }} - ports: - - name: prometheus - port: 9091 - targetPort: prometheus - protocol: TCP + {{- end }} + selector: app: {{ template "osm-seed.name" . }} release: {{ .Release.Name }} From 94ad0fe8087f4d2303723cd6a16a4eaa0ab9fbff Mon Sep 17 00:00:00 2001 From: Rub21 Date: Mon, 18 Nov 2024 10:32:47 -0500 Subject: [PATCH 05/10] Update tiler db templates - adding sharedMemorySize --- .../templates/tiler-db/tiler-db-statefulset.yaml | 6 ++++++ osm-seed/values.yaml | 16 ++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/osm-seed/templates/tiler-db/tiler-db-statefulset.yaml b/osm-seed/templates/tiler-db/tiler-db-statefulset.yaml index 724f1f04..3f0c1a43 100644 --- a/osm-seed/templates/tiler-db/tiler-db-statefulset.yaml +++ b/osm-seed/templates/tiler-db/tiler-db-statefulset.yaml @@ -79,6 +79,8 @@ spec: - name: tiler-db-postgresql-config mountPath: /etc/postgresql/ {{- end }} + - name: shared-memory + mountPath: /dev/shm {{- if .Values.tilerDb.resources.enabled }} resources: requests: @@ -101,6 +103,10 @@ spec: configMap: name: {{ .Release.Name }}-tiler-db-postgresql-config {{- end }} + - name: shared-memory + emptyDir: + medium: Memory + sizeLimit: {{ .Values.tilerDb.sharedMemorySize }} {{- if .Values.tilerDb.nodeSelector.enabled }} nodeSelector: {{ .Values.tilerDb.nodeSelector.label_key }} : {{ .Values.tilerDb.nodeSelector.label_value }} diff --git a/osm-seed/values.yaml b/osm-seed/values.yaml index 2a345d6d..ada552a7 100644 --- a/osm-seed/values.yaml +++ b/osm-seed/values.yaml @@ -376,6 +376,7 @@ tilerDb: # GCP GCP_gcePersistentDisk_pdName: osmseed-disk-tilerdb-v1 GCP_gcePersistentDisk_size: 50Gi + sharedMemorySize: 64Mi resources: enabled: false requests: @@ -526,6 +527,21 @@ tilerServerCacheCleaner: minReplicas: 1 maxReplicas: 2 cpuUtilization: 60 + +tilerCacheCleanerJob: + enabled: false + tilesFile: imposm/imposm3_expire_dir/latest.tiles + minZoom: 0 + maxZoom: 20 + overwrite: true + resources: + enabled: false + requests: + memory: "1Gi" + cpu: "500m" + limits: + memory: "2Gi" + cpu: "1" # ==================================================================================================== # Variables for Tasking Manager DB # ==================================================================================================== From 37a0f934a92ba6205475357724f56eeb49c41b08 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Mon, 18 Nov 2024 10:59:19 -0500 Subject: [PATCH 06/10] Set default sharedMemorySize --- osm-seed/templates/tiler-db/tiler-db-statefulset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osm-seed/templates/tiler-db/tiler-db-statefulset.yaml b/osm-seed/templates/tiler-db/tiler-db-statefulset.yaml index 3f0c1a43..c1b473e5 100644 --- a/osm-seed/templates/tiler-db/tiler-db-statefulset.yaml +++ b/osm-seed/templates/tiler-db/tiler-db-statefulset.yaml @@ -106,7 +106,7 @@ spec: - name: shared-memory emptyDir: medium: Memory - sizeLimit: {{ .Values.tilerDb.sharedMemorySize }} + sizeLimit: {{ .Values.tilerDb.sharedMemorySize | default "64Mi" }} {{- if .Values.tilerDb.nodeSelector.enabled }} nodeSelector: {{ .Values.tilerDb.nodeSelector.label_key }} : {{ .Values.tilerDb.nodeSelector.label_value }} From 6779f4ae7d0e442ae805067c68e0a20bb84622b6 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Tue, 26 Nov 2024 15:30:10 -0500 Subject: [PATCH 07/10] Add ttlSecondsAfterFinished for cronjob - osmcha --- osm-seed/templates/osmcha-app/cronJob.yaml | 24 ++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/osm-seed/templates/osmcha-app/cronJob.yaml b/osm-seed/templates/osmcha-app/cronJob.yaml index acb11030..5bb9871e 100644 --- a/osm-seed/templates/osmcha-app/cronJob.yaml +++ b/osm-seed/templates/osmcha-app/cronJob.yaml @@ -11,10 +11,11 @@ metadata: spec: schedule: "*/2 * * * *" concurrencyPolicy: Forbid - successfulJobsHistoryLimit: 2 - failedJobsHistoryLimit: 2 + successfulJobsHistoryLimit: 1 + failedJobsHistoryLimit: 1 jobTemplate: spec: + ttlSecondsAfterFinished: 120 template: spec: containers: @@ -32,12 +33,12 @@ spec: restartPolicy: Never {{- if .Values.osmchaApi.nodeSelector.enabled }} nodeSelector: - {{ .Values.osmchaApi.nodeSelector.label_key }} : {{ .Values.osmchaApi.nodeSelector.label_value }} + {{ .Values.osmchaApi.nodeSelector.label_key }}: {{ .Values.osmchaApi.nodeSelector.label_value }} {{- end }} --- apiVersion: batch/v1 -kind: CronJob +kind: CronJob metadata: name: {{ .Release.Name }}-osmcha-process-changesets-cronjob labels: @@ -48,10 +49,11 @@ metadata: spec: schedule: "0 * * * *" concurrencyPolicy: Forbid - successfulJobsHistoryLimit: 2 - failedJobsHistoryLimit: 2 + successfulJobsHistoryLimit: 1 + failedJobsHistoryLimit: 1 jobTemplate: spec: + ttlSecondsAfterFinished: 120 template: spec: containers: @@ -62,13 +64,19 @@ spec: - /bin/sh - -c - | - python manage.py backfill_changesets $(date -d "yesterday" +%Y-%m-%d) $(date +%Y-%m-%d) + YESTERDAY=$(date -d "yesterday" +%Y-%m-%d) + TODAY=$(date +%Y-%m-%d) + + python manage.py backfill_changesets "$YESTERDAY" "$TODAY" + EXIT_CODE=$? + + exit $EXIT_CODE envFrom: - configMapRef: name: {{ .Release.Name }}-osmcha-common-env restartPolicy: Never {{- if .Values.osmchaApi.nodeSelector.enabled }} nodeSelector: - {{ .Values.osmchaApi.nodeSelector.label_key }} : {{ .Values.osmchaApi.nodeSelector.label_value }} + {{ .Values.osmchaApi.nodeSelector.label_key }}: {{ .Values.osmchaApi.nodeSelector.label_value }} {{- end }} {{- end }} From 5f7eff51dbc138ff37fe89381f15c8f30c7c8c34 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 28 Nov 2024 14:17:06 -0500 Subject: [PATCH 08/10] Add env var for imposm - tiler --- osm-seed/templates/tiler-imposm/tiler-imposm-statefulset.yaml | 2 ++ osm-seed/values.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/osm-seed/templates/tiler-imposm/tiler-imposm-statefulset.yaml b/osm-seed/templates/tiler-imposm/tiler-imposm-statefulset.yaml index a5834332..f765c005 100644 --- a/osm-seed/templates/tiler-imposm/tiler-imposm-statefulset.yaml +++ b/osm-seed/templates/tiler-imposm/tiler-imposm-statefulset.yaml @@ -69,6 +69,8 @@ spec: value: {{ .Values.tilerImposm.env.IMPORT_NATURAL_EARTH | default "true" | quote }} - name: IMPORT_OSM_LAND value: {{ .Values.tilerImposm.env.IMPORT_OSM_LAND | default "true" | quote }} + - name: IMPOSM3_IMPORT_LAYERS + value: {{ .Values.tilerImposm.env.IMPOSM3_IMPORT_LAYERS | default "all" | quote }} - name: CLOUDPROVIDER value: {{ .Values.cloudProvider }} # In case cloudProvider=aws diff --git a/osm-seed/values.yaml b/osm-seed/values.yaml index ada552a7..02bdf834 100644 --- a/osm-seed/values.yaml +++ b/osm-seed/values.yaml @@ -424,6 +424,7 @@ tilerImposm: UPLOAD_EXPIRED_FILES: true IMPORT_NATURAL_EARTH: true IMPORT_OSM_LAND: true + IMPOSM3_IMPORT_LAYERS: all persistenceDisk: enabled: false accessMode: ReadWriteOnce From b7799d4c58471a4dc4dd6057330f6c5c77d866fd Mon Sep 17 00:00:00 2001 From: Rub21 Date: Fri, 29 Nov 2024 08:15:07 -0500 Subject: [PATCH 09/10] 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: From 370bddd88bdb15746f27abd6d77a1040eb2c4082 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Fri, 29 Nov 2024 08:17:40 -0500 Subject: [PATCH 10/10] Add default values for EXECUTE_REINDEX and EXECUTE_VACUUM_ANALYZE --- osm-seed/templates/tiler-server/tiler-server-configMap.yaml | 4 ++-- osm-seed/values.yaml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/osm-seed/templates/tiler-server/tiler-server-configMap.yaml b/osm-seed/templates/tiler-server/tiler-server-configMap.yaml index 9427bd30..06c858a7 100644 --- a/osm-seed/templates/tiler-server/tiler-server-configMap.yaml +++ b/osm-seed/templates/tiler-server/tiler-server-configMap.yaml @@ -17,8 +17,8 @@ data: 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 }} + EXECUTE_REINDEX: {{ .Values.tilerServer.env.EXECUTE_REINDEX | default "false" | quote }} + EXECUTE_VACUUM_ANALYZE: {{ .Values.tilerServer.env.EXECUTE_VACUUM_ANALYZE | default "false" | quote }} CLOUDPROVIDER: {{ .Values.cloudProvider | quote }} {{- if eq .Values.cloudProvider "aws" }} AWS_S3_BUCKET: {{ .Values.AWS_S3_BUCKET | quote }} diff --git a/osm-seed/values.yaml b/osm-seed/values.yaml index 02bdf834..b32db40c 100644 --- a/osm-seed/values.yaml +++ b/osm-seed/values.yaml @@ -471,6 +471,8 @@ tilerServer: TILER_CACHE_REGION: us-east-1 TILER_CACHE_AWS_ACCESS_KEY_ID: xyz TILER_CACHE_AWS_SECRET_ACCESS_KEY: xyz/q + EXECUTE_REINDEX: false + EXECUTE_VACUUM_ANALYZE: false command: "./start.sh" # ./start.sh & ./tile_cache_downloader.sh & ./expire-watcher.sh # In case you use TILER_CACHE_TYPE: file with persistenceDisk persistenceDisk: