diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04fa1ae..6b8581f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,6 +73,7 @@ jobs: - name: Apply Kubernetes manifests 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_service.yaml diff --git a/k8s/db_secret.yaml b/k8s/db_secret.yaml new file mode 100644 index 0000000..ab60f8e --- /dev/null +++ b/k8s/db_secret.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: Secret +metadata: + name: db-secret + +type: Opaque +data: + SPRING_DATASOURCE_PASSWORD: cGFzc3dvcmQ= diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml index 23c1c2b..6eb1cea 100644 --- a/k8s/deployment.yaml +++ b/k8s/deployment.yaml @@ -21,14 +21,17 @@ spec: envFrom: - configMapRef: name: db-config - - configMapRef: - name: db-secret env: - name: SECURITY_JWT_SECRET valueFrom: secretKeyRef: name: security-secret key: jwt-secret + - name: DATASOURCE_PASSWORD + valueFrom: + secretKeyRef: + name: db-secret + key: SPRING_DATASOURCE_PASSWORD readinessProbe: httpGet: path: /actuator/health diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5ff4f84..3005c60 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -5,7 +5,7 @@ spring: datasource: url: ${SPRING_DATASOURCE_URL}/security_db username: ${SPRING_DATASOURCE_USERNAME} - password: ${SPRING_DATASOURCE_PASSWORD} + password: ${DATASOURCE_PASSWORD} driver-class-name: org.postgresql.Driver jpa: