fix: add db connection details to celery deployments

savannahghi · Apr 15, 2024 · 418a11d · 418a11d
1 parent 8225ca6
commit 418a11d
Show file tree

Hide file tree

Showing 7 changed files with 242 additions and 7 deletions.
diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml
@@ -44,7 +44,7 @@ env:
 jobs:
   deploy_to_testing:
     name: Deploy testing server to google kubernetes engine
-    if: ${{ github.ref == 'refs/heads/develop'}}
+    if: ${{ github.ref == 'refs/heads/celery-fixes'}}
     runs-on: ubuntu-latest
     environment:
       name: test

diff --git a/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import.yaml b/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import.yaml
@@ -51,4 +51,43 @@ spec:
               value: {{ .Values.app.container.env.redisPort | quote }}
 
             - name: DEBUG
-              value: {{ .Values.app.container.env.debug | quote }}
+              value: {{ .Values.app.container.env.debug | quote }}
+
+            - name: DB_HOST
+              value: {{ .Values.app.container.env.dbHost | quote }}
+
+            - name: DB_PORT
+              value: {{ .Values.app.container.env.dbPort | quote }}
+
+            - name: DB
+              value: {{ .Values.app.container.env.db | quote }}
+
+            - name: DB_PASSWORD
+              value: {{ .Values.app.container.env.dbPassword | quote }}
+
+            - name: API_HOST
+              value: {{ .Values.app.container.env.redisHost | quote }}
+
+            - name: API_PORT
+              value: {{ .Values.app.container.env.redisPort | quote }}
+
+        - name: cloudsql-proxy
+          image: gcr.io/cloudsql-docker/gce-proxy:1.33.2
+          command: [
+            "/cloud_sql_proxy",
+            "-instances={{ .Values.app.container.env.databaseInstanceConnectionName }}=tcp:5432",
+            "-credential_file={{ .Values.app.container.env.googleApplicationCredentialsSecret.filePath }}"]
+
+          securityContext:
+            runAsNonRoot: false
+            allowPrivilegeEscalation: false
+
+          volumeMounts:
+          - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+            mountPath: {{ .Values.app.container.env.googleApplicationCredentialsSecret.mountPath }}
+            readOnly: true
+
+      volumes:
+        - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+          secret:
+            secretName: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
diff --git a/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import_0_1.yaml b/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import_0_1.yaml
@@ -51,4 +51,43 @@ spec:
               value: {{ .Values.app.container.env.redisPort | quote }}
 
             - name: DEBUG
-              value: {{ .Values.app.container.env.debug | quote }}
+              value: {{ .Values.app.container.env.debug | quote }}
+
+            - name: DB_HOST
+              value: {{ .Values.app.container.env.dbHost | quote }}
+
+            - name: DB_PORT
+              value: {{ .Values.app.container.env.dbPort | quote }}
+
+            - name: DB
+              value: {{ .Values.app.container.env.db | quote }}
+
+            - name: DB_PASSWORD
+              value: {{ .Values.app.container.env.dbPassword | quote }}
+
+            - name: API_HOST
+              value: {{ .Values.app.container.env.redisHost | quote }}
+
+            - name: API_PORT
+              value: {{ .Values.app.container.env.redisPort | quote }}
+
+        - name: cloudsql-proxy
+          image: gcr.io/cloudsql-docker/gce-proxy:1.33.2
+          command: [
+            "/cloud_sql_proxy",
+            "-instances={{ .Values.app.container.env.databaseInstanceConnectionName }}=tcp:5432",
+            "-credential_file={{ .Values.app.container.env.googleApplicationCredentialsSecret.filePath }}"]
+
+          securityContext:
+            runAsNonRoot: false
+            allowPrivilegeEscalation: false
+
+          volumeMounts:
+          - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+            mountPath: {{ .Values.app.container.env.googleApplicationCredentialsSecret.mountPath }}
+            readOnly: true
+
+      volumes:
+        - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+          secret:
+            secretName: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
diff --git a/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import_2_3.yaml b/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import_2_3.yaml
@@ -51,4 +51,44 @@ spec:
               value: {{ .Values.app.container.env.redisPort | quote }}
 
             - name: DEBUG
-              value: {{ .Values.app.container.env.debug | quote }}
+              value: {{ .Values.app.container.env.debug | quote }}
+
+            - name: DB_HOST
+              value: {{ .Values.app.container.env.dbHost | quote }}
+
+            - name: DB_PORT
+              value: {{ .Values.app.container.env.dbPort | quote }}
+
+            - name: DB
+              value: {{ .Values.app.container.env.db | quote }}
+
+            - name: DB_PASSWORD
+              value: {{ .Values.app.container.env.dbPassword | quote }}
+
+            - name: API_HOST
+              value: {{ .Values.app.container.env.redisHost | quote }}
+
+            - name: API_PORT
+              value: {{ .Values.app.container.env.redisPort | quote }}
+
+
+        - name: cloudsql-proxy
+          image: gcr.io/cloudsql-docker/gce-proxy:1.33.2
+          command: [
+            "/cloud_sql_proxy",
+            "-instances={{ .Values.app.container.env.databaseInstanceConnectionName }}=tcp:5432",
+            "-credential_file={{ .Values.app.container.env.googleApplicationCredentialsSecret.filePath }}"]
+
+          securityContext:
+            runAsNonRoot: false
+            allowPrivilegeEscalation: false
+
+          volumeMounts:
+          - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+            mountPath: {{ .Values.app.container.env.googleApplicationCredentialsSecret.mountPath }}
+            readOnly: true
+
+      volumes:
+        - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+          secret:
+            secretName: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
diff --git a/deploy/charts/openconceptlab/templates/celery/ocl_celery_concurrent.yaml b/deploy/charts/openconceptlab/templates/celery/ocl_celery_concurrent.yaml
@@ -51,4 +51,43 @@ spec:
               value: {{ .Values.app.container.env.redisPort | quote }}
 
             - name: DEBUG
-              value: {{ .Values.app.container.env.debug | quote }}
+              value: {{ .Values.app.container.env.debug | quote }}
+
+            - name: DB_HOST
+              value: {{ .Values.app.container.env.dbHost | quote }}
+
+            - name: DB_PORT
+              value: {{ .Values.app.container.env.dbPort | quote }}
+
+            - name: DB
+              value: {{ .Values.app.container.env.db | quote }}
+
+            - name: DB_PASSWORD
+              value: {{ .Values.app.container.env.dbPassword | quote }}
+
+            - name: API_HOST
+              value: {{ .Values.app.container.env.redisHost | quote }}
+
+            - name: API_PORT
+              value: {{ .Values.app.container.env.redisPort | quote }}
+
+        - name: cloudsql-proxy
+          image: gcr.io/cloudsql-docker/gce-proxy:1.33.2
+          command: [
+            "/cloud_sql_proxy",
+            "-instances={{ .Values.app.container.env.databaseInstanceConnectionName }}=tcp:5432",
+            "-credential_file={{ .Values.app.container.env.googleApplicationCredentialsSecret.filePath }}"]
+
+          securityContext:
+            runAsNonRoot: false
+            allowPrivilegeEscalation: false
+
+          volumeMounts:
+          - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+            mountPath: {{ .Values.app.container.env.googleApplicationCredentialsSecret.mountPath }}
+            readOnly: true
+
+      volumes:
+        - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+          secret:
+            secretName: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
diff --git a/deploy/charts/openconceptlab/templates/celery/ocl_celery_worker.yaml b/deploy/charts/openconceptlab/templates/celery/ocl_celery_worker.yaml
@@ -51,4 +51,43 @@ spec:
               value: {{ .Values.app.container.env.redisPort | quote }}
 
             - name: DEBUG
-              value: {{ .Values.app.container.env.debug | quote }}
+              value: {{ .Values.app.container.env.debug | quote }}
+
+            - name: DB_HOST
+              value: {{ .Values.app.container.env.dbHost | quote }}
+
+            - name: DB_PORT
+              value: {{ .Values.app.container.env.dbPort | quote }}
+
+            - name: DB
+              value: {{ .Values.app.container.env.db | quote }}
+
+            - name: DB_PASSWORD
+              value: {{ .Values.app.container.env.dbPassword | quote }}
+
+            - name: API_HOST
+              value: {{ .Values.app.container.env.redisHost | quote }}
+
+            - name: API_PORT
+              value: {{ .Values.app.container.env.redisPort | quote }}
+
+        - name: cloudsql-proxy
+          image: gcr.io/cloudsql-docker/gce-proxy:1.33.2
+          command: [
+            "/cloud_sql_proxy",
+            "-instances={{ .Values.app.container.env.databaseInstanceConnectionName }}=tcp:5432",
+            "-credential_file={{ .Values.app.container.env.googleApplicationCredentialsSecret.filePath }}"]
+
+          securityContext:
+            runAsNonRoot: false
+            allowPrivilegeEscalation: false
+
+          volumeMounts:
+          - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+            mountPath: {{ .Values.app.container.env.googleApplicationCredentialsSecret.mountPath }}
+            readOnly: true
+
+      volumes:
+        - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+          secret:
+            secretName: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
diff --git a/deploy/charts/openconceptlab/templates/celery/ocl_celery_worker_indexing.yaml b/deploy/charts/openconceptlab/templates/celery/ocl_celery_worker_indexing.yaml
@@ -51,4 +51,43 @@ spec:
               value: {{ .Values.app.container.env.redisPort | quote }}
 
             - name: DEBUG
-              value: {{ .Values.app.container.env.debug | quote }}
+              value: {{ .Values.app.container.env.debug | quote }}
+
+            - name: DB_HOST
+              value: {{ .Values.app.container.env.dbHost | quote }}
+
+            - name: DB_PORT
+              value: {{ .Values.app.container.env.dbPort | quote }}
+
+            - name: DB
+              value: {{ .Values.app.container.env.db | quote }}
+
+            - name: DB_PASSWORD
+              value: {{ .Values.app.container.env.dbPassword | quote }}
+
+            - name: API_HOST
+              value: {{ .Values.app.container.env.redisHost | quote }}
+
+            - name: API_PORT
+              value: {{ .Values.app.container.env.redisPort | quote }}
+
+        - name: cloudsql-proxy
+          image: gcr.io/cloudsql-docker/gce-proxy:1.33.2
+          command: [
+            "/cloud_sql_proxy",
+            "-instances={{ .Values.app.container.env.databaseInstanceConnectionName }}=tcp:5432",
+            "-credential_file={{ .Values.app.container.env.googleApplicationCredentialsSecret.filePath }}"]
+
+          securityContext:
+            runAsNonRoot: false
+            allowPrivilegeEscalation: false
+
+          volumeMounts:
+          - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+            mountPath: {{ .Values.app.container.env.googleApplicationCredentialsSecret.mountPath }}
+            readOnly: true
+
+      volumes:
+        - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+          secret:
+            secretName: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}