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

feat(helm): use release.name inside psql dependency #474

Merged
merged 3 commits into from
Jun 15, 2023
Merged

feat(helm): use release.name inside psql dependency #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a95e39
feat(helm): use release.name inside psql dependency
fty4 Jun 13, 2023
209515c
feat(helm): use release.name inside psql dependency (azure-vault)
fty4 Jun 13, 2023
f74e531
fix(test): add release.name to tx-c test (psql)
fty4 Jun 13, 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
12 changes: 6 additions & 6 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 @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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 ##
Expand Down
3 changes: 1 addition & 2 deletions charts/tractusx-connector-azure-vault/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,8 +495,7 @@ dataplane:
public: ""

postgresql:
jdbcUrl: ""
fullnameOverride: "postgresql"
jdbcUrl: "jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc"
primary:
persistence:
enabled: false
Expand Down
12 changes: 6 additions & 6 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 @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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 ##
Expand Down
2 changes: 1 addition & 1 deletion charts/tractusx-connector/templates/deployment-dataplane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##
Expand Down
3 changes: 1 addition & 2 deletions charts/tractusx-connector/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 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,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
Expand Down