chore:rename django key env var

bcgov · Feb 13, 2024 · 987f64c · 987f64c
1 parent 79049e4
commit 987f64c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 29 deletions.
diff --git a/helm/cas-reporting/templates/backend/deployment.yaml b/helm/cas-reporting/templates/backend/deployment.yaml
@@ -31,30 +31,10 @@ spec:
                 secretKeyRef:
                   key: django-secret-key
                   name: {{ .Release.Name }}-backend
-            - name: DB_USER
+            - name: DB_FULL_URI
               valueFrom:
                 secretKeyRef:
-                  key: user
-                  name: {{ .Values.database.secret }}
-            - name: DB_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  key: password
-                  name: {{ .Values.database.secret }}
-            - name: DB_NAME
-              valueFrom:
-                secretKeyRef:
-                  key: dbname
-                  name: {{ .Values.database.secret }}
-            - name: DB_PORT
-              valueFrom:
-                secretKeyRef:
-                  key: port
-                  name: {{ .Values.database.secret }}
-            - name: DB_HOST
-              valueFrom:
-                secretKeyRef:
-                  key: host
+                  key: pgbouncer-uri
                   name: {{ .Values.database.secret }}
             - name: ALLOWED_HOSTS
               value: '*'

diff --git a/helm/cas-reporting/templates/frontend/deployment.yaml b/helm/cas-reporting/templates/frontend/deployment.yaml
@@ -26,11 +26,11 @@ spec:
           env:
             - name: API_URL
               value: http://{{ include "cas-reporting.fullname" . }}-backend.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.backend.service.port }}/api/
-            - name: KEYCLOAK_CLIENT_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: keycloak-gold-client-secret
-                  key: kcClientSecret
+            # - name: KEYCLOAK_CLIENT_SECRET
+            #   valueFrom:
+            #     secretKeyRef:
+            #       name: keycloak-gold-client-secret
+            #       key: kcClientSecret
             - name: KEYCLOAK_AUTH_URL
               value: {{ .Values.frontend.auth.keycloakAuthUrl}}
             - name: KEYCLOAK_REALMS

diff --git a/server/.env.example b/server/.env.example
@@ -1,4 +1,4 @@
-SECRET_KEY=change-this-secret-key
+DJANGO_SECRET_KEY=change-this-secret-key
 DB_NAME=your_db_name
 DB_USER=your_db_user
 DB_PASSWORD=your_password

diff --git a/server/server/settings.py b/server/server/settings.py
@@ -25,7 +25,7 @@
 # See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = os.environ.get("SECRET_KEY")
+SECRET_KEY = os.environ.get("DJANGO_SECRET_KEY")
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True