From 8a0ecd351b4be8e62e2420767de6f2a632a55c92 Mon Sep 17 00:00:00 2001 From: AnonimProgrammer Date: Thu, 9 Oct 2025 18:46:04 +0400 Subject: [PATCH 1/2] Updates. --- .github/workflows/ci.yml | 1 - k8s/db_deployment.yaml | 22 +++++----------------- k8s/db_secret.yaml | 8 -------- 3 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 k8s/db_secret.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1714375..761c46a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,6 @@ jobs: run: | kubectl apply -f k8s/deployment.yaml kubectl apply -f k8s/service.yaml - kubectl apply -f k8s/db_secret.yaml kubectl apply -f k8s/redis_deployment.yaml kubectl apply -f k8s/redis_service.yaml kubectl apply -f k8s/db_deployment.yaml diff --git a/k8s/db_deployment.yaml b/k8s/db_deployment.yaml index d25da88..2b15d19 100644 --- a/k8s/db_deployment.yaml +++ b/k8s/db_deployment.yaml @@ -1,11 +1,10 @@ apiVersion: apps/v1 -kind: StatefulSet +kind: Deployment metadata: name: micropay-db - + namespace: default spec: - serviceName: micropay-db - replicas: 2 + replicas: 1 selector: matchLabels: app: micropay-db @@ -21,25 +20,14 @@ spec: - containerPort: 5432 env: - name: POSTGRES_DB - value: micropay-db + value: security_db - name: POSTGRES_USER valueFrom: configMapKeyRef: - key: SPRING_DATASOURCE_USERNAME name: security-config + key: SPRING_DATASOURCE_USERNAME - name: POSTGRES_PASSWORD valueFrom: secretKeyRef: name: db-secret key: SPRING_DATASOURCE_PASSWORD - volumeMounts: - - name: pgdata - mountPath: /var/lib/postgresql/data - volumeClaimTemplates: - - metadata: - name: pgdata - spec: - accessModes: ["ReadWriteOnce"] - resources: - requests: - storage: 1Gi diff --git a/k8s/db_secret.yaml b/k8s/db_secret.yaml deleted file mode 100644 index a28df44..0000000 --- a/k8s/db_secret.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: db-secret -type: Opaque -data: - SPRING_DATASOURCE_PASSWORD: cGFzc3dvcmQ= - From 6fd8f71693d72cbbab93ba7ba07c22ae55860699 Mon Sep 17 00:00:00 2001 From: AnonimProgrammer Date: Thu, 9 Oct 2025 19:08:06 +0400 Subject: [PATCH 2/2] Updates. --- k8s/db_deployment.yaml | 2 +- src/main/resources/application.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/k8s/db_deployment.yaml b/k8s/db_deployment.yaml index 2b15d19..f925c0a 100644 --- a/k8s/db_deployment.yaml +++ b/k8s/db_deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: micropay-db - namespace: default + spec: replicas: 1 selector: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 4acc17d..1396cb7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -34,8 +34,8 @@ server: security: jwt: secret: ${SECURITY_JWT_SECRET} - access-token-validity: 900000 # 15 minutes - refresh-token-validity: 604800000 # 7 days + access-token-validity: 900000 + refresh-token-validity: 604800000 management: endpoints: