fix: wrong postgres env vars for deployment templates (#464)

* Fix wrong postgres env vars for deployment templates * Fix postgres config in helm chart test
eclipse-tractusx · Jun 12, 2023 · 29d4874 · 29d4874
1 parent 3db9d24
commit 29d4874
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 22 deletions.
diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
@@ -178,59 +178,59 @@ spec:
             - name: "EDC_DATASOURCE_ASSET_NAME"
               value: "asset"
             - name: "EDC_DATASOURCE_ASSET_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_ASSET_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_ASSET_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
             # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/contract-definition-store-sql
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_NAME"
               value: "contractdefinition"
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
             # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/contract-negotiation-store-sql
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_NAME"
               value: "contractnegotiation"
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
             # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/policy-store-sql
             - name: "EDC_DATASOURCE_POLICY_NAME"
               value: "policy"
             - name: "EDC_DATASOURCE_POLICY_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_POLICY_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_POLICY_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
             # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/transfer-process-store-sql
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_NAME"
               value: "transferprocess"
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
             # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql
             - name: "EDC_DATASOURCE_EDR_NAME"
               value: "edr"
             - name: "EDC_DATASOURCE_EDR_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 

diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
@@ -155,9 +155,9 @@ spec:
             - name: "EDC_DATASOURCE_EDR_NAME"
               value: "edr"
             - name: "EDC_DATASOURCE_EDR_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 

diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -228,9 +228,9 @@ spec:
             - name: "EDC_DATASOURCE_EDR_NAME"
               value: "edr"
             - name: "EDC_DATASOURCE_EDR_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 

diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -155,9 +155,9 @@ spec:
             - name: "EDC_DATASOURCE_EDR_NAME"
               value: "edr"
             - name: "EDC_DATASOURCE_EDR_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 

diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
@@ -71,9 +71,10 @@ dataplane:
     accessKeyId: qwerty123
 
 postgresql:
-  username: user
-  password: password
   jdbcUrl: jdbc:postgresql://postgresql:5432/edc
+  auth:
+    username: user
+    password: password
 
 vault:
   azure:

diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
@@ -56,9 +56,10 @@ dataplane:
       accessKeyId: qwerty123
 
 postgresql:
-  username: user
-  password: password
   jdbcUrl: jdbc:postgresql://postgresql:5432/edc
+  auth:
+    username: user
+    password: password
 
 vault:
   hashicorp: