From b145f708cf31cbac4a38b601bc8aec2ae152d7b8 Mon Sep 17 00:00:00 2001 From: Agent Date: Fri, 20 Mar 2026 15:13:39 +0000 Subject: [PATCH] Update config to use env variables --- k8s/backend/deployment.yaml | 27 +++++++++++++++++++++------ k8s/configmap.yaml | 20 ++++++++++++-------- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/k8s/backend/deployment.yaml b/k8s/backend/deployment.yaml index 7ec697b..3885d93 100644 --- a/k8s/backend/deployment.yaml +++ b/k8s/backend/deployment.yaml @@ -24,16 +24,26 @@ spec: ports: - containerPort: 8080 env: - - name: SPRING_DATASOURCE_URL + - name: SPRING_DATASOURCE_HOST valueFrom: configMapKeyRef: name: todo-config - key: DATABASE_URL + key: SPRING_DATASOURCE_HOST + - name: SPRING_DATASOURCE_PORT + valueFrom: + configMapKeyRef: + name: todo-config + key: SPRING_DATASOURCE_PORT + - name: SPRING_DATASOURCE_DB + valueFrom: + configMapKeyRef: + name: todo-config + key: SPRING_DATASOURCE_DB - name: SPRING_DATASOURCE_USERNAME valueFrom: configMapKeyRef: name: todo-config - key: DATABASE_USERNAME + key: SPRING_DATASOURCE_USERNAME - name: SPRING_DATASOURCE_PASSWORD valueFrom: secretKeyRef: @@ -43,12 +53,17 @@ spec: valueFrom: configMapKeyRef: name: todo-config - key: REDIS_HOST + key: SPRING_REDIS_HOST - name: SPRING_REDIS_PORT valueFrom: configMapKeyRef: name: todo-config - key: REDIS_PORT + key: SPRING_REDIS_PORT + - name: SPRING_REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: todo-db-secret + key: REDIS_PASSWORD resources: requests: memory: "512Mi" @@ -99,7 +114,7 @@ spec: valueFrom: configMapKeyRef: name: todo-config - key: DATABASE_USERNAME + key: SPRING_DATASOURCE_USERNAME - name: POSTGRES_PASSWORD valueFrom: secretKeyRef: diff --git a/k8s/configmap.yaml b/k8s/configmap.yaml index dc12468..307cb14 100644 --- a/k8s/configmap.yaml +++ b/k8s/configmap.yaml @@ -4,10 +4,12 @@ metadata: name: todo-config namespace: todo-test data: - DATABASE_URL: "jdbc:postgresql://todo-postgres:5432/building_materials" - DATABASE_USERNAME: "postgres" - REDIS_HOST: "todo-redis" - REDIS_PORT: "6379" + SPRING_DATASOURCE_HOST: "todo-postgres" + SPRING_DATASOURCE_PORT: "5432" + SPRING_DATASOURCE_DB: "building_materials" + SPRING_DATASOURCE_USERNAME: "postgres" + SPRING_REDIS_HOST: "todo-redis" + SPRING_REDIS_PORT: "6379" API_BASE_URL: "http://todo-backend:8080" --- apiVersion: v1 @@ -16,8 +18,10 @@ metadata: name: todo-config namespace: todo-prod data: - DATABASE_URL: "jdbc:postgresql://todo-postgres:5432/building_materials" - DATABASE_USERNAME: "postgres" - REDIS_HOST: "todo-redis" - REDIS_PORT: "6379" + SPRING_DATASOURCE_HOST: "todo-postgres" + SPRING_DATASOURCE_PORT: "5432" + SPRING_DATASOURCE_DB: "building_materials" + SPRING_DATASOURCE_USERNAME: "postgres" + SPRING_REDIS_HOST: "todo-redis" + SPRING_REDIS_PORT: "6379" API_BASE_URL: "http://todo-backend:8080"