cronjob to process replication files (#24)

* cronjob to process replication files * Update image tag and cron schedule --------- Co-authored-by: Wille Marcel <[email protected]>
developmentseed · Apr 15, 2024 · 37b2f16 · 37b2f16
1 parent 90eb255
commit 37b2f16
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 1 deletion.
diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml
@@ -34,4 +34,7 @@ jobs:
         osmcha ./helm/osmcha \
         --set secrets.osm_access_key=${{ secrets.OSM_ACCESS_KEY }} \
         --set secrets.osm_secret_key=${{ secrets.OSM_SECRET_KEY }} \
-        --set secrets.osmcha_db_password="${{ secrets.OSMCHA_DB_PASSWORD }}"
+        --set secrets.osmcha_db_password="${{ secrets.OSMCHA_DB_PASSWORD }}" \
+        --set secrets.real_changesets_access_key=${{ secrets.REAL_CHANGESETS_ACCESS_KEY }} \
+        --set secrets.real_changesets_secret_key=${{ secrets.REAL_CHANGESETS_SECRET_KEY }} \
+        --set secrets.osmcha_admin_token=${{ secrets.OSMCHA_ADMIN_TOKEN }}
diff --git a/helm/osmcha/templates/cron.yaml b/helm/osmcha/templates/cron.yaml
@@ -51,3 +51,47 @@ spec:
             - name: REDIS_URL
               value: {{ .Values.app.api.redis_url }}
           restartPolicy: Never
+
+---
+
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: osmcha-adiff-service-cronjob
+    app: osmcha
+    environment: {{ .Values.config.environment }}
+    release: {{ .Release.Name }}
+spec:
+  schedule: "*/1 * * * *"
+  concurrencyPolicy: Forbid
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+          - name: osmcha-adiff-service-process-replication
+            image: {{ .Values.adiff_service.image.repository }}:{{ .Values.adiff_service.image.tag }}
+            imagePullPolicy: IfNotPresent
+            command:
+            - /bin/sh
+            - -c
+            - yarn update-queue
+            env:
+            - name: AWS_ACCESS_KEY_ID
+              valueFrom:
+                secretKeyRef:
+                  name: osmcha-real-changesets-credentials
+                  key: access_key
+            - name: AWS_SECRET_ACCESS_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: osmcha-real-changesets-credentials
+                  key: secret_key
+            - name: OsmchaAdminToken
+              valueFrom:
+                secretKeyRef:
+                  name: osmcha-admin-token
+                  key: osmcha_admin_token
+            - name: RedisServer
+              value: {{ .Values.adiff_service.redis_url }}
+          restartPolicy: Never
diff --git a/helm/osmcha/templates/secrets.yaml b/helm/osmcha/templates/secrets.yaml
@@ -16,3 +16,24 @@ metadata:
 type: Opaque
 data:
   password: {{ .Values.secrets.osmcha_db_password | b64enc | quote}}
+
+---
+
+apiVersion: v1
+kind: Secret
+metadata:
+  name: osmcha-real-changesets-credentials
+type: Opaque
+data:
+  access_key: {{ .Values.secrets.real_changesets_access_key | b64enc | quote}}
+  secret_key: {{ .Values.secrets.real_changesets_secret_key | b64enc | quote}}
+
+---
+
+apiVersion: v1
+kind: Secret
+metadata:
+  name: osmcha-admin-token
+type: Opaque
+data:
+  osmcha_admin_token: {{ .Values.secrets.osmcha_admin_token | b64enc | quote}}
diff --git a/helm/osmcha/values.yaml b/helm/osmcha/values.yaml
@@ -6,6 +6,9 @@ secrets:
   osm_access_key:
   osm_secret_key:
   osmcha_db_password:
+  real_changesets_access_key:
+  real_changesets_secret_key:
+  osmcha_admin_token:
 
 app:
   replicas: 2
@@ -120,3 +123,10 @@ app:
             }
           }
         }
+
+# OSMCha adiff service
+adiff_service:
+  image:
+    repository: ghcr.io/osmcha/osm-adiff-service
+    tag: 8f83fd410d02795f5d321a54fdcfa39b8c7b29c9
+  redis_url: redis://redis-master:6379