diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml index d5d9d0300..1d1b565a5 100644 --- a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml +++ b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml @@ -182,7 +182,7 @@ spec: - name: "EDC_DATASOURCE_ASSET_PASSWORD" 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 }} + value: {{ tpl .Values.postgresql.jdbcUrl . | 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" @@ -192,7 +192,7 @@ spec: - name: "EDC_DATASOURCE_CONTRACTDEFINITION_PASSWORD" 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 }} + value: {{ tpl .Values.postgresql.jdbcUrl . | 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" @@ -202,7 +202,7 @@ spec: - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_PASSWORD" 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 }} + value: {{ tpl .Values.postgresql.jdbcUrl . | quote }} # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/policy-store-sql - name: "EDC_DATASOURCE_POLICY_NAME" @@ -212,7 +212,7 @@ spec: - name: "EDC_DATASOURCE_POLICY_PASSWORD" 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 }} + value: {{ tpl .Values.postgresql.jdbcUrl . | 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" @@ -222,7 +222,7 @@ spec: - name: "EDC_DATASOURCE_TRANSFERPROCESS_PASSWORD" 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 }} + value: {{ tpl .Values.postgresql.jdbcUrl . | quote }} # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql - name: "EDC_DATASOURCE_EDR_NAME" @@ -232,7 +232,7 @@ spec: - name: "EDC_DATASOURCE_EDR_PASSWORD" 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 }} + value: {{ tpl .Values.postgresql.jdbcUrl . | quote }} ################ ## DATA PLANE ## diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml index 3a124ad81..14c2d32cf 100644 --- a/charts/tractusx-connector-azure-vault/values.yaml +++ b/charts/tractusx-connector-azure-vault/values.yaml @@ -495,8 +495,7 @@ dataplane: public: "" postgresql: - jdbcUrl: "" - fullnameOverride: "postgresql" + jdbcUrl: "jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc" primary: persistence: enabled: false diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml index 6229250ae..0fdd22442 100644 --- a/charts/tractusx-connector/templates/deployment-controlplane.yaml +++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml @@ -182,7 +182,7 @@ spec: - name: "EDC_DATASOURCE_ASSET_PASSWORD" 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 }} + value: {{ tpl .Values.postgresql.jdbcUrl . | 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" @@ -192,7 +192,7 @@ spec: - name: "EDC_DATASOURCE_CONTRACTDEFINITION_PASSWORD" 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 }} + value: {{ tpl .Values.postgresql.jdbcUrl . | 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" @@ -202,7 +202,7 @@ spec: - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_PASSWORD" 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 }} + value: {{ tpl .Values.postgresql.jdbcUrl . | quote }} # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/policy-store-sql - name: "EDC_DATASOURCE_POLICY_NAME" @@ -212,7 +212,7 @@ spec: - name: "EDC_DATASOURCE_POLICY_PASSWORD" 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 }} + value: {{ tpl .Values.postgresql.jdbcUrl . | 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" @@ -222,7 +222,7 @@ spec: - name: "EDC_DATASOURCE_TRANSFERPROCESS_PASSWORD" 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 }} + value: {{ tpl .Values.postgresql.jdbcUrl . | quote }} # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql - name: "EDC_DATASOURCE_EDR_NAME" @@ -232,7 +232,7 @@ spec: - name: "EDC_DATASOURCE_EDR_PASSWORD" 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 }} + value: {{ tpl .Values.postgresql.jdbcUrl . | quote }} ################ ## DATA PLANE ## diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml index 9d7e9f50d..aeb2109e7 100644 --- a/charts/tractusx-connector/templates/deployment-dataplane.yaml +++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml @@ -159,7 +159,7 @@ spec: - name: "EDC_DATASOURCE_EDR_PASSWORD" 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 }} + value: {{ tpl .Values.postgresql.jdbcUrl . | quote }} ########### ## VAULT ## diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml index a09fcde03..f5be53097 100644 --- a/charts/tractusx-connector/values.yaml +++ b/charts/tractusx-connector/values.yaml @@ -489,8 +489,7 @@ dataplane: # -- Explicitly declared url for reaching the public api (e.g. if ingresses not used) public: "" postgresql: - jdbcUrl: "" - fullnameOverride: "postgresql" + jdbcUrl: "jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc" primary: persistence: enabled: false 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 index 085db3869..a773d488a 100644 --- 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,7 +56,7 @@ dataplane: accessKeyId: qwerty123 postgresql: - jdbcUrl: jdbc:postgresql://postgresql:5432/edc + jdbcUrl: jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc auth: username: user password: password