feat: consolidate k8s database settings to a ConfigMap

Open-Earth-Foundation · Feb 25, 2025 · f896c14 · f896c14
1 parent 2519209
commit f896c14
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 58 deletions.
diff --git a/k8s/cc-create-admin.yml b/k8s/cc-create-admin.yml
@@ -11,17 +11,12 @@ spec:
         - name: cc-create-admin
           image: ghcr.io/open-earth-foundation/citycatalyst:latest
           imagePullPolicy: Always
+          envFrom:
+            - configMapRef:
+                name: cc-db-configmap
           env:
             - name: NODE_ENV
               value: development
-            - name: DATABASE_NAME
-              value: "citycatalyst"
-            - name: DATABASE_HOST
-              value: "cc-db"
-            - name: DATABASE_USER
-              value: "citycatalyst"
-            - name: DATABASE_PASSWORD
-              value: "development"
           command: ["npm", "run", "create-admin"]
           resources:
             limits:

diff --git a/k8s/cc-db-backup-manual.yml b/k8s/cc-db-backup-manual.yml
@@ -17,13 +17,25 @@ spec:
         imagePullPolicy: Always
         env:
         - name: PGUSER
-          value: "citycatalyst"
+          valueFrom:
+            configMapKeyRef:
+              key: DATABASE_USER
+              name: cc-db-configmap
         - name: PGHOST
-          value: "cc-db"
+          valueFrom:
+            configMapKeyRef:
+              key: DATABASE_HOST
+              name: cc-db-configmap
         - name: PGDATABASE
-          value: "citycatalyst"
+          valueFrom:
+            configMapKeyRef:
+              key: DATABASE_NAME
+              name: cc-db-configmap
         - name: PGPASSWORD
-          value: "development"
+          valueFrom:
+            configMapKeyRef:
+              key: DATABASE_PASSWORD
+              name: cc-db-configmap
         args:
         - |
           pg_dump | gzip > /var/backups/citycatalyst.sql.gz

diff --git a/k8s/cc-db-backup.yml b/k8s/cc-db-backup.yml
@@ -21,13 +21,25 @@ spec:
             imagePullPolicy: Always
             env:
             - name: PGUSER
-              value: "citycatalyst"
+              valueFrom:
+                configMapKeyRef:
+                  key: DATABASE_USER
+                  name: cc-db-configmap
             - name: PGHOST
-              value: "cc-db"
+              valueFrom:
+                configMapKeyRef:
+                  key: DATABASE_HOST
+                  name: cc-db-configmap
             - name: PGDATABASE
-              value: "citycatalyst"
+              valueFrom:
+                configMapKeyRef:
+                  key: DATABASE_NAME
+                  name: cc-db-configmap
             - name: PGPASSWORD
-              value: "development"
+              valueFrom:
+                configMapKeyRef:
+                  key: DATABASE_PASSWORD
+                  name: cc-db-configmap
             args:
             - |
               pg_dump | gzip > /var/backups/citycatalyst.sql.gz

diff --git a/k8s/cc-db-configmap.yml b/k8s/cc-db-configmap.yml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cc-db-configmap
+  namespace: default
+data:
+  DATABASE_HOST: "cc-db"
+  DATABASE_NAME: "citycatalyst"
+  DATABASE_USER: "citycatalyst"
+  DATABASE_PASSWORD: "development"
diff --git a/k8s/cc-db-deploy.yml b/k8s/cc-db-deploy.yml
@@ -28,9 +28,15 @@ spec:
               cpu: "1000m"
           env:
             - name: "POSTGRES_USER"
-              value: "citycatalyst"
+              valueFrom:
+                configMapKeyRef:
+                  key: DATABASE_USER
+                  name: cc-db-configmap
             - name: "POSTGRES_PASSWORD"
-              value: "development"
+              valueFrom:
+                configMapKeyRef:
+                  key: DATABASE_PASSWORD
+                  name: cc-db-configmap
             - name: PGDATA
               value: /var/lib/postgresql/pgdata
           ports:

diff --git a/k8s/cc-migrate.yml b/k8s/cc-migrate.yml
@@ -11,16 +11,11 @@ spec:
       - name: cc-migrate
         image: ghcr.io/open-earth-foundation/citycatalyst:latest
         imagePullPolicy: Always
+        envFrom:
+          - configMapRef:
+              name: cc-db-configmap
         env:
         - name: NODE_ENV
-          value: development
-        - name: DATABASE_NAME
-          value: "citycatalyst"
-        - name: DATABASE_HOST
-          value: "cc-db"
-        - name: DATABASE_USER
-          value: "citycatalyst"
-        - name: DATABASE_PASSWORD
           value: "development"
         command: ["npm",  "run", "db:migrate"]
         resources:

diff --git a/k8s/cc-seed.yml b/k8s/cc-seed.yml
@@ -11,17 +11,12 @@ spec:
       - name: cc-seed
         image: ghcr.io/open-earth-foundation/citycatalyst:latest
         imagePullPolicy: Always
+        envFrom:
+          - configMapRef:
+              name: cc-db-configmap
         env:
         - name: NODE_ENV
           value: development
-        - name: DATABASE_NAME
-          value: "citycatalyst"
-        - name: DATABASE_HOST
-          value: "cc-db"
-        - name: DATABASE_USER
-          value: "citycatalyst"
-        - name: DATABASE_PASSWORD
-          value: "development"
         command: ["npm",  "run", "db:seed"]
         resources:
           limits:

diff --git a/k8s/cc-sync-catalogue-manual.yml b/k8s/cc-sync-catalogue-manual.yml
@@ -11,17 +11,12 @@ spec:
         - name: cc-sync-catalogue
           image: ghcr.io/open-earth-foundation/citycatalyst:latest
           imagePullPolicy: Always
+          envFrom:
+            - configMapRef:
+                name: cc-db-configmap
           env:
             - name: NODE_ENV
               value: development
-            - name: DATABASE_NAME
-              value: "citycatalyst"
-            - name: DATABASE_HOST
-              value: "cc-db"
-            - name: DATABASE_USER
-              value: "citycatalyst"
-            - name: DATABASE_PASSWORD
-              value: "development"
             - name: GLOBAL_API_URL
               value: "https://ccglobal.openearth.dev"
             - name: npm_config_yes

diff --git a/k8s/cc-sync-catalogue.yml b/k8s/cc-sync-catalogue.yml
@@ -15,16 +15,11 @@ spec:
             - name: cc-sync-catalogue
               image: ghcr.io/open-earth-foundation/citycatalyst:latest
               imagePullPolicy: Always
+              envFrom:
+                - configMapRef:
+                    name: cc-db-configmap
               env:
                 - name: NODE_ENV
-                  value: development
-                - name: DATABASE_NAME
-                  value: "citycatalyst"
-                - name: DATABASE_HOST
-                  value: "cc-db"
-                - name: DATABASE_USER
-                  value: "citycatalyst"
-                - name: DATABASE_PASSWORD
                   value: "development"
                 - name: npm_config_yes
                   value: "true"

diff --git a/k8s/cc-web-deploy.yml b/k8s/cc-web-deploy.yml
@@ -21,19 +21,14 @@ spec:
           imagePullPolicy: Always
           ports:
             - containerPort: 3000
+          envFrom:
+            - configMapRef:
+                name: cc-db-configmap
           env:
             - name: NODE_ENV
               value: "production"
             - name: PORT
               value: "3000"
-            - name: DATABASE_HOST
-              value: "cc-db"
-            - name: DATABASE_NAME
-              value: "citycatalyst"
-            - name: DATABASE_USER
-              value: "citycatalyst"
-            - name: DATABASE_PASSWORD
-              value: "development"
             - name: NEXTAUTH_URL
               value: "https://citycatalyst.openearth.dev"
             - name: HOST