Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: wrong postgres env vars for deployment templates #464

Merged
merged 2 commits into from
Jun 12, 2023
Merged

fix: wrong postgres env vars for deployment templates #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82cce80
Fix wrong postgres env vars for deployment templates
ayhanmesin-zf Jun 12, 2023
7fae341
Fix postgres config in helm chart test
ayhanmesin-zf Jun 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
4 changes: 2 additions & 2 deletions charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
4 changes: 2 additions & 2 deletions charts/tractusx-connector/templates/deployment-controlplane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
4 changes: 2 additions & 2 deletions charts/tractusx-connector/templates/deployment-dataplane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
5 changes: 3 additions & 2 deletions edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 3 additions & 2 deletions edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down