From 6e26567f105c96ae12341440e525ac0c7f2957c1 Mon Sep 17 00:00:00 2001
From: AnonimProgrammer <zephyr11ff@gmail.com>
Date: Fri, 10 Oct 2025 14:30:38 +0400
Subject: [PATCH] Config updates.

---
 .github/workflows/ci.yml           | 2 +-
 k8s/db_config.yaml                 | 7 -------
 k8s/db_config_security.yaml        | 6 ++++++
 k8s/db_deployment.yaml             | 6 +++---
 k8s/db_secret.yaml                 | 1 +
 k8s/deployment.yaml                | 7 ++++++-
 src/main/resources/application.yml | 4 ++--
 7 files changed, 19 insertions(+), 14 deletions(-)
 delete mode 100644 k8s/db_config.yaml
 create mode 100644 k8s/db_config_security.yaml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6b8581f..d55635e 100644
--- a/.github/workflows/ci.yml
+++ b/.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
diff --git a/k8s/db_config.yaml b/k8s/db_config.yaml
deleted file mode 100644
index d06274b..0000000
--- a/k8s/db_config.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: db-config
-data:
-  SPRING_DATASOURCE_URL: "jdbc:postgresql://micropay-db:5432"
-  SPRING_DATASOURCE_USERNAME: "user"
\ No newline at end of file
diff --git a/k8s/db_config_security.yaml b/k8s/db_config_security.yaml
new file mode 100644
index 0000000..9c8e5e5
--- /dev/null
+++ b/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
diff --git a/k8s/db_deployment.yaml b/k8s/db_deployment.yaml
index 69fe230..806a670 100644
--- a/k8s/db_deployment.yaml
+++ b/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:
diff --git a/k8s/db_secret.yaml b/k8s/db_secret.yaml
index ab60f8e..238e737 100644
--- a/k8s/db_secret.yaml
+++ b/k8s/db_secret.yaml
@@ -6,3 +6,4 @@ metadata:
 type: Opaque
 data:
   SPRING_DATASOURCE_PASSWORD: cGFzc3dvcmQ=
+  SPRING_DATASOURCE_USER: dXNlcg==
diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml
index 6eb1cea..a35e88f 100644
--- a/k8s/deployment.yaml
+++ b/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
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3005c60..63f72e1 100644
--- a/src/main/resources/application.yml
+++ b/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