put database config into env

eclipse-tractusx · Jan 8, 2025 · fba8804 · fba8804
1 parent 7012b43
commit fba8804
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/charts/bdrs-server/templates/deployment.yaml b/charts/bdrs-server/templates/deployment.yaml
@@ -168,6 +168,11 @@ spec:
               value: "didentry"
 
             # note that the DB user and password must be put in the vault using the "edc.datasource.didentry.[user|password]" aliases, respectively!
+
+            - name: "EDC_DATASOURCE_DIDENTRY_USER"
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
+            - name: "EDC_DATASOURCE_DIDENTRY_PASSWORD"
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_DIDENTRY_URL"
               value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
 

diff --git a/system-tests/helm/values-vault-test.yaml b/system-tests/helm/values-vault-test.yaml
@@ -31,11 +31,7 @@ server:
     - |-
       {
       sleep 5
-      
-      /bin/vault kv put secret/edc.datasource.didentry.user content=bdrs
-      
-      /bin/vault kv put secret/edc.datasource.didentry.password content=password
-      
+
       /bin/vault kv put secret/mgmt-api-key content=password
       }
 hashicorp:
@@ -46,4 +42,4 @@ hashicorp:
     standbyOk: true
   paths:
     secret: /v1/secret
-    health: /v1/sys/health
+    health: /v1/sys/health