deploy(test): test ocl deployment with increased resource allocation

savannahghi · May 15, 2024 · d9e66c1 · d9e66c1
1 parent 8225ca6
commit d9e66c1
Show file tree

Hide file tree

Showing 12 changed files with 301 additions and 66 deletions.
diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml
@@ -18,8 +18,10 @@ env:
   DB_PORT: ${{ secrets.DB_PORT }}
   DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
   DB: ${{ secrets.DB }}
-  ES_HOST: ${{ secrets.ES_HOST }}
+  ES_HOSTS: ${{ secrets.ES_HOSTS }}
   ES_PORT: ${{ secrets.ES_PORT }}
+  ES_USER: ${{ secrets.ES_USER }}
+  ES_PASSWORD: ${{ secrets.ES_PASSWORD }}
   ENVIRONMENT: ${{ secrets.ENVIRONMENT }}
   DEBUG: ${{ secrets.DEBUG }}
   SECRET_KEY: ${{ secrets.SECRET_KEY }}
@@ -44,7 +46,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/test-deploy'}}
     runs-on: ubuntu-latest
     environment:
       name: test

diff --git a/deploy/charts/openconceptlab/templates/celery/ocl_celery_beat.yaml b/deploy/charts/openconceptlab/templates/celery/ocl_celery_beat.yaml
@@ -36,12 +36,6 @@ spec:
           args: [
               "./start_celery_beat.sh"
           ]
-          ports:
-            - name: http
-              containerPort: {{ .Values.service.backendport }}
-              protocol: TCP
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
 
           env:
             - name: REDIS_HOST
@@ -63,10 +57,10 @@ spec:
               value: {{ .Values.app.container.env.dbPassword | quote }}
 
             - name: API_HOST
-              value: {{ .Values.app.container.env.redisHost | quote }}
+              value: {{ .Values.service.backendServiceName }}
 
             - name: API_PORT
-              value: {{ .Values.app.container.env.redisPort | quote }}
+              value: {{ .Values.service.backendport | quote }}
 
             - name: DEBUG
               value: {{ .Values.app.container.env.debug | quote }}

diff --git a/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import.yaml b/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import.yaml
@@ -36,13 +36,7 @@ spec:
           args: [
               "CELERY_WORKER_NAME=bulk_import_root ./start_celery_worker.sh -Q bulk_import_root -c 1"
           ]
-          ports:
-            - name: http
-              containerPort: {{ .Values.service.backendport }}
-              protocol: TCP
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-
+
           env:
             - name: REDIS_HOST
               value: {{ .Values.app.container.env.redisHost | quote }}
@@ -51,4 +45,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.service.backendServiceName }}
+
+            - name: API_PORT
+              value: {{ .Values.service.backendport | 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
@@ -36,13 +36,7 @@ spec:
           args: [
               "CELERY_WORKER_NAME=bulk_import_0_1 ./start_celery_worker.sh -Q bulk_import_0,bulk_import_1 -c 1"
           ]
-          ports:
-            - name: http
-              containerPort: {{ .Values.service.backendport }}
-              protocol: TCP
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-
+
           env:
             - name: REDIS_HOST
               value: {{ .Values.app.container.env.redisHost | quote }}
@@ -51,4 +45,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.service.backendServiceName }}
+
+            - name: API_PORT
+              value: {{ .Values.service.backendport | 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
@@ -36,12 +36,6 @@ spec:
           args: [
               "CELERY_WORKER_NAME=bulk_import_2_3 ./start_celery_worker.sh -Q bulk_import_2,bulk_import_3 -c 1"
           ]
-          ports:
-            - name: http
-              containerPort: {{ .Values.service.backendport }}
-              protocol: TCP
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
 
           env:
             - name: REDIS_HOST
@@ -51,4 +45,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.service.backendServiceName }}
+
+            - name: API_PORT
+              value: {{ .Values.service.backendport | 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
@@ -36,13 +36,7 @@ spec:
           args: [
               "CELERY_WORKER_NAME=concurrent ./start_celery_worker.sh -P prefork -Q concurrent -c 2"
           ]
-          ports:
-            - name: http
-              containerPort: {{ .Values.service.backendport }}
-              protocol: TCP
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-
+
           env:
             - name: REDIS_HOST
               value: {{ .Values.app.container.env.redisHost | quote }}
@@ -51,4 +45,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.service.backendServiceName }}
+
+            - name: API_PORT
+              value: {{ .Values.service.backendport | 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
@@ -36,12 +36,6 @@ spec:
           args: [
               "CELERY_WORKER_NAME=default ./start_celery_worker.sh -P prefork -Q default -c 2"
           ]
-          ports:
-            - name: http
-              containerPort: {{ .Values.service.backendport }}
-              protocol: TCP
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
 
           env:
             - name: REDIS_HOST
@@ -51,4 +45,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.service.backendServiceName }}
+
+            - name: API_PORT
+              value: {{ .Values.service.backendport | 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 }}