Config updates.

.github/workflows/ci.yml

@@ -75,7 +75,7 @@ jobs:
         run: |
           kubectl apply -f k8s/db_secret.yaml
           kubectl apply -f k8s/db_deployment.yaml
-          kubectl apply -f k8s/db_config.yaml
+          kubectl apply -f k8s/db_config_security.yaml
           kubectl apply -f k8s/db_service.yaml
           kubectl apply -f k8s/deployment.yaml
           kubectl apply -f k8s/service.yaml

k8s/db_config_security.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: db-config-security
+data:
+  SPRING_DATASOURCE_URL: jdbc:postgresql://micropay-db:5432/security_db

k8s/db_deployment.yaml

@@ -20,9 +20,9 @@ spec:
           env:
             - name: POSTGRES_USER
               valueFrom:
-                configMapKeyRef:
-                  name: db-config
-                  key: SPRING_DATASOURCE_USERNAME
+                secretKeyRef:
+                  name: db-secret
+                  key: SPRING_DATASOURCE_USER
             - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:

k8s/db_secret.yaml

@@ -6,3 +6,4 @@ metadata:
 type: Opaque
 data:
   SPRING_DATASOURCE_PASSWORD: cGFzc3dvcmQ=
+  SPRING_DATASOURCE_USER: dXNlcg==

k8s/deployment.yaml

@@ -20,7 +20,7 @@ spec:
             - containerPort: 8150
           envFrom:
             - configMapRef:
-                name: db-config
+                name: db-config-security
           env:
             - name: SECURITY_JWT_SECRET
               valueFrom:
@@ -32,6 +32,11 @@ spec:
                secretKeyRef:
                  name: db-secret
                  key: SPRING_DATASOURCE_PASSWORD
+            - name: DATASOURCE_USER
+              valueFrom:
+                secretKeyRef:
+                  name: db-secret
+                  key: SPRING_DATASOURCE_USER
           readinessProbe:
             httpGet:
               path: /actuator/health

src/main/resources/application.yml

@@ -3,8 +3,8 @@ spring:
     name: micropay-security
 
   datasource:
-    url: ${SPRING_DATASOURCE_URL}/security_db
-    username: ${SPRING_DATASOURCE_USERNAME}
+    url: ${SPRING_DATASOURCE_URL}
+    username: ${DATASOURCE_USER}
     password: ${DATASOURCE_PASSWORD}
     driver-class-name: org.postgresql.Driver