chore: consolidate environment variables

.gitignore

@@ -305,3 +305,4 @@ media/
 local.sh
 secrets/*
 cloud_sql_proxy
+deploy_copy

cloudbuild.yaml

@@ -95,12 +95,22 @@ steps:
       - --values
       - values.yaml
       - --set
+      - project_id=$PROJECT_ID
+      - --set
       - namespace=${_NAMESPACE}
       - --set
       - django.image.repository=${_IMAGE_NAME}
       - --set
       - django.image.tag=$COMMIT_SHA
       - --set
+      - django.env_vars.settings_name=${_SETTINGS_NAME}
+      - --set
+      - django.env_vars.django_settings_module=${_DJANGO_SETTINGS_MODULE}
+      - --set
+      - django.env_vars.postgres_host=${_PG_HOST}
+      - --set
+      - django.env_vars.postgres_port=${_PG_PORT}
+      - --set
       - ingress.networking.domain=${_DOMAIN_NAME}
       - --set
       - ingress.networking.issuer.name=${_LETSENCRYPT_SERVER_TYPE}
@@ -132,12 +142,22 @@ steps:
       - --values
       - values.yaml
       - --set
+      - project_id=$PROJECT_ID
+      - --set
       - namespace=${_NAMESPACE}
       - --set
       - django.image.repository=${_IMAGE_NAME}
       - --set
       - django.image.tag=$COMMIT_SHA
       - --set
+      - django.env_vars.settings_name=${_SETTINGS_NAME}
+      - --set
+      - django.env_vars.django_settings_module=${_DJANGO_SETTINGS_MODULE}
+      - --set
+      - django.env_vars.postgres_host=${_PG_HOST}
+      - --set
+      - django.env_vars.postgres_port=${_PG_PORT}
+      - --set
       - ingress.networking.domain=${_DOMAIN_NAME}
       - --set
       - ingress.networking.issuer.name=${_LETSENCRYPT_SERVER_TYPE}

deploy/templates/django/deployment.yaml

@@ -26,9 +26,21 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ .Values.django.configmap.config_name }}
+          env:
+            - name: SETTINGS_NAME
+              value: {{ .Values.django.env_vars.settings_name }}
+            - name: PORT
+              value: "8080"
+            - name: DJANGO_SETTINGS_MODULE
+              value: {{ .Values.django.env_vars.django_settings_module }}
+            - name: POSTGRES_HOST
+              value: {{ .Values.django.env_vars.postgres_host }}
+            - name: POSTGRES_PORT
+              value: {{ .Values.django.env_vars.postgres_port | toString | quote }}
           volumeMounts:
             - name: env-var-vol
-              mountPath: /secrets/environment_variables
+              mountPath: /secrets/app_configs/configs.ini
+              subPath: configs.ini
               readOnly: true
 
       volumes:

deploy/templates/pg-bouncer/deployment.yaml

@@ -22,6 +22,7 @@ spec:
             - configMapRef:
                 name: {{ .Values.pg_bouncer.app_name }}-db-config
           volumeMounts:
+            # mountPath should be the same as `auth_file` in `pgb_configmap.yml`
             - name: user-config
               mountPath: /bitnami/pgbouncer/conf/userlist.txt
               subPath: userlist.txt
@@ -41,6 +42,7 @@ spec:
             - name: sa-secret-vol
               mountPath: /secrets/service_account_secrets
               readOnly: true
+
       volumes:
         - name: user-config
           configMap:

deploy/values.yaml

@@ -1,4 +1,5 @@
 namespace: cluster_namespace
+project_id: fyj
 
 django:
   app_name: django
@@ -15,6 +16,11 @@ django:
     config_name: "config_name"
   secrets:
     secrets_name: "secrets_name"
+  env_vars:
+    settings_name: "idr_test_secrets"
+    django_settings_module: "config.settings.local"
+    postgres_host: "pgb-service"
+    postgres_port: "6432"
 
 cloud_sql:
   app_name: cloudsql-proxy