Skip to content

Commit 1a554e6

Browse files
wolf4oodTuncay Tunc (ZF Friedrichshafen AG)
wolf4ood
and
Tuncay Tunc (ZF Friedrichshafen AG)
authored
feature: participant id configuration and extractor (#427)
* Update Postman Collection for the version 0.4.0 * feat(Identity): add identity extractor from referringConnector * feat(Identity): updated charts * chore(protocol): switch default to /api/v1/dsp * chore(DataPlaneProxy): adds configuration for DataPlaneProxy * pr remarks * pr remarks * open api update * fix after review * fix after review --------- Co-authored-by: Tuncay Tunc (ZF Friedrichshafen AG) <tuncay.tunc.external@zf.com>
1 parent c94a86b commit 1a554e6

File tree

39 files changed

+834
-415
lines changed

39 files changed

+834
-415
lines changed

‎charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml

+20-20
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,12 @@ spec:
109109
{{- end }}
110110
{{- end }}
111111

112+
########################
113+
## ID CONFIGURATION ##
114+
########################
115+
- name: EDC_PARTICIPANT_ID
116+
value: {{ .Values.participant.id | required ".Values.participant.id is required" | quote }}
117+
112118
########################
113119
## DAPS CONFIGURATION ##
114120
########################
@@ -154,31 +160,15 @@ spec:
154160
value: {{ .Values.controlplane.endpoints.observability.insecure | quote }}
155161

156162
#########
157-
## IDS ##
163+
## DSP ##
158164
#########
159-
- name: "IDS_WEBHOOK_ADDRESS"
160-
value: {{ include "txdc.controlplane.url.protocol" . | quote }}
161-
- name: "EDC_IDS_ENDPOINT"
165+
166+
- name: "EDC_DSP_CALLBACK_ADDRESS"
162167
value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" .) .Values.controlplane.endpoints.protocol.path | quote }}
163-
- name: "EDC_IDS_ID"
164-
value: {{ printf "urn:connector:%s" (lower .Values.controlplane.internationalDataSpaces.id) | quote }}
165-
- name: "EDC_IDS_DESCRIPTION"
166-
value: {{ .Values.controlplane.internationalDataSpaces.description | quote }}
167-
- name: "EDC_IDS_TITLE"
168-
value: {{ .Values.controlplane.internationalDataSpaces.title | quote }}
169-
- name: "EDC_IDS_MAINTAINER"
170-
value: {{ .Values.controlplane.internationalDataSpaces.maintainer | quote }}
171-
- name: "EDC_IDS_CURATOR"
172-
value: {{ .Values.controlplane.internationalDataSpaces.curator | quote }}
173-
- name: "EDC_IDS_CATALOG_ID"
174-
value: {{ printf "urn:catalog:%s" (lower .Values.controlplane.internationalDataSpaces.catalogId) | quote }}
175168
- name: "EDC_OAUTH_PROVIDER_AUDIENCE"
176169
value: "idsc:IDS_CONNECTORS_ALL"
177170
- name: "EDC_OAUTH_ENDPOINT_AUDIENCE"
178-
value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
179-
# this is the old setting name for 'EDC_OAUTH_ENDPOINT_AUDIENCE' and is mandatory for Produce EDC v0.1.2 and older
180-
- name: "EDC_IDS_ENDPOINT_AUDIENCE"
181-
value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
171+
value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path | quote }}
182172

183173
################
184174
## POSTGRESQL ##
@@ -234,6 +224,16 @@ spec:
234224
- name: "EDC_DATASOURCE_TRANSFERPROCESS_URL"
235225
value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
236226

227+
# see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql
228+
- name: "EDC_DATASOURCE_EDR_NAME"
229+
value: "edr"
230+
- name: "EDC_DATASOURCE_EDR_USER"
231+
value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
232+
- name: "EDC_DATASOURCE_EDR_PASSWORD"
233+
value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
234+
- name: "EDC_DATASOURCE_EDR_URL"
235+
value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
236+
237237
################
238238
## DATA PLANE ##
239239
################

‎charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,20 @@ spec:
147147
value: {{ .Values.dataplane.aws.accessKeyId | quote }}
148148
{{- end }}
149149

150+
###############
151+
## EDR CACHE ##
152+
###############
153+
154+
# see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql
155+
- name: "EDC_DATASOURCE_EDR_NAME"
156+
value: "edr"
157+
- name: "EDC_DATASOURCE_EDR_USER"
158+
value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
159+
- name: "EDC_DATASOURCE_EDR_PASSWORD"
160+
value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
161+
- name: "EDC_DATASOURCE_EDR_URL"
162+
value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
163+
150164
###########
151165
## VAULT ##
152166
###########

‎charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,9 @@ spec:
4848
targetPort: metrics
4949
protocol: TCP
5050
name: metrics
51+
- port: {{ .Values.dataplane.endpoints.proxy.port }}
52+
targetPort: proxy
53+
protocol: TCP
54+
name: proxy
5155
selector:
5256
{{- include "txdc.dataplane.selectorLabels" . | nindent 4 }}

‎charts/tractusx-connector-azure-vault/values.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ imagePullSecrets: []
3434

3535
customLabels: {}
3636

37+
participant:
38+
id: ""
39+
3740
controlplane:
3841
image:
3942
# -- Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically
@@ -107,7 +110,7 @@ controlplane:
107110
# -- port for incoming api calls
108111
port: 8084
109112
# -- path for incoming api calls
110-
path: /api/v1/ids
113+
path: /api/v1/dsp
111114
# -- metrics api, used for application metrics, must not be internet facing
112115
metrics:
113116
# -- port for incoming api calls
@@ -340,6 +343,9 @@ dataplane:
340343
control:
341344
port: 8083
342345
path: /api/dataplane/control
346+
proxy:
347+
port: 8186
348+
path: /proxy
343349
observability:
344350
# -- port for incoming API calls
345351
port: 8085

‎charts/tractusx-connector-memory/example.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232

3333
---
3434
fullnameOverride: tx-inmem
35+
36+
participant:
37+
id: "test-participant"
38+
3539
runtime:
3640
service:
3741
type: NodePort

‎charts/tractusx-connector-memory/templates/deployment-runtime.yaml

+10-20
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,12 @@ spec:
109109
{{- end }}
110110
{{- end }}
111111

112+
########################
113+
## ID CONFIGURATION ##
114+
########################
115+
- name: EDC_PARTICIPANT_ID
116+
value: {{ .Values.participant.id | required ".Values.participant.id is required" | quote }}
117+
112118
########################
113119
## DAPS CONFIGURATION ##
114120
########################
@@ -175,31 +181,15 @@ spec:
175181
value: {{ include "txdc.runtime.url.validation" .}}
176182

177183
#########
178-
## IDS ##
184+
## DSP ##
179185
#########
180-
- name: "IDS_WEBHOOK_ADDRESS"
181-
value: {{ include "txdc.runtime.url.protocol" . | quote }}
182-
- name: "EDC_IDS_ENDPOINT"
186+
187+
- name: "EDC_DSP_CALLBACK_ADDRESS"
183188
value: {{ printf "%s%s" (include "txdc.runtime.url.protocol" .) .Values.runtime.endpoints.protocol.path | quote }}
184-
- name: "EDC_IDS_ID"
185-
value: {{ printf "urn:connector:%s" (lower .Values.runtime.internationalDataSpaces.id) | quote }}
186-
- name: "EDC_IDS_DESCRIPTION"
187-
value: {{ .Values.runtime.internationalDataSpaces.description | quote }}
188-
- name: "EDC_IDS_TITLE"
189-
value: {{ .Values.runtime.internationalDataSpaces.title | quote }}
190-
- name: "EDC_IDS_MAINTAINER"
191-
value: {{ .Values.runtime.internationalDataSpaces.maintainer | quote }}
192-
- name: "EDC_IDS_CURATOR"
193-
value: {{ .Values.runtime.internationalDataSpaces.curator | quote }}
194-
- name: "EDC_IDS_CATALOG_ID"
195-
value: {{ printf "urn:catalog:%s" (lower .Values.runtime.internationalDataSpaces.catalogId) | quote }}
196189
- name: "EDC_OAUTH_PROVIDER_AUDIENCE"
197190
value: "idsc:IDS_CONNECTORS_ALL"
198191
- name: "EDC_OAUTH_ENDPOINT_AUDIENCE"
199-
value: {{ printf "%s%s%s" (include "txdc.runtime.url.protocol" . ) .Values.runtime.endpoints.protocol.path "/data" | quote }}
200-
# this is the old setting name for 'EDC_OAUTH_ENDPOINT_AUDIENCE' and is mandatory for Produce EDC v0.1.2 and older
201-
- name: "EDC_IDS_ENDPOINT_AUDIENCE"
202-
value: {{ printf "%s%s%s" (include "txdc.runtime.url.protocol" . ) .Values.runtime.endpoints.protocol.path "/data" | quote }}
192+
value: {{ printf "%s%s" (include "txdc.runtime.url.protocol" . ) .Values.runtime.endpoints.protocol.path | quote }}
203193

204194
################
205195
## DATA PLANE ##

‎charts/tractusx-connector-memory/values.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ imagePullSecrets: []
3131

3232
customLabels: {}
3333

34+
participant:
35+
id: ""
36+
3437
runtime:
3538
image:
3639
repository: ""
@@ -109,7 +112,7 @@ runtime:
109112
# -- port for incoming api calls
110113
port: 8084
111114
# -- path for incoming api calls
112-
path: /api/v1/ids
115+
path: /api/v1/dsp
113116
# -- observability api with unsecured access, must not be internet facing
114117
observability:
115118
# -- port for incoming API calls
@@ -121,6 +124,9 @@ runtime:
121124
public:
122125
port: 8086
123126
path: /api/public
127+
proxy:
128+
port: 8186
129+
path: /proxy
124130
businessPartnerValidation:
125131
log:
126132
agreementValidation: true

‎charts/tractusx-connector/templates/deployment-controlplane.yaml

+20-20
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,12 @@ spec:
109109
{{- end }}
110110
{{- end }}
111111

112+
########################
113+
## ID CONFIGURATION ##
114+
########################
115+
- name: EDC_PARTICIPANT_ID
116+
value: {{ .Values.participant.id | required ".Values.participant.id is required" | quote }}
117+
112118
########################
113119
## DAPS CONFIGURATION ##
114120
########################
@@ -154,31 +160,15 @@ spec:
154160
value: {{ .Values.controlplane.endpoints.observability.insecure | quote }}
155161

156162
#########
157-
## IDS ##
163+
## DSP ##
158164
#########
159-
- name: "IDS_WEBHOOK_ADDRESS"
160-
value: {{ include "txdc.controlplane.url.protocol" . | quote }}
161-
- name: "EDC_IDS_ENDPOINT"
165+
166+
- name: "EDC_DSP_CALLBACK_ADDRESS"
162167
value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" .) .Values.controlplane.endpoints.protocol.path | quote }}
163-
- name: "EDC_IDS_ID"
164-
value: {{ printf "urn:connector:%s" (lower .Values.controlplane.internationalDataSpaces.id) | quote }}
165-
- name: "EDC_IDS_DESCRIPTION"
166-
value: {{ .Values.controlplane.internationalDataSpaces.description | quote }}
167-
- name: "EDC_IDS_TITLE"
168-
value: {{ .Values.controlplane.internationalDataSpaces.title | quote }}
169-
- name: "EDC_IDS_MAINTAINER"
170-
value: {{ .Values.controlplane.internationalDataSpaces.maintainer | quote }}
171-
- name: "EDC_IDS_CURATOR"
172-
value: {{ .Values.controlplane.internationalDataSpaces.curator | quote }}
173-
- name: "EDC_IDS_CATALOG_ID"
174-
value: {{ printf "urn:catalog:%s" (lower .Values.controlplane.internationalDataSpaces.catalogId) | quote }}
175168
- name: "EDC_OAUTH_PROVIDER_AUDIENCE"
176169
value: "idsc:IDS_CONNECTORS_ALL"
177170
- name: "EDC_OAUTH_ENDPOINT_AUDIENCE"
178-
value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
179-
# this is the old setting name for 'EDC_OAUTH_ENDPOINT_AUDIENCE' and is mandatory for Produce EDC v0.1.2 and older
180-
- name: "EDC_IDS_ENDPOINT_AUDIENCE"
181-
value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
171+
value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path | quote }}
182172

183173
################
184174
## POSTGRESQL ##
@@ -234,6 +224,16 @@ spec:
234224
- name: "EDC_DATASOURCE_TRANSFERPROCESS_URL"
235225
value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
236226

227+
# see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql
228+
- name: "EDC_DATASOURCE_EDR_NAME"
229+
value: "edr"
230+
- name: "EDC_DATASOURCE_EDR_USER"
231+
value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
232+
- name: "EDC_DATASOURCE_EDR_PASSWORD"
233+
value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
234+
- name: "EDC_DATASOURCE_EDR_URL"
235+
value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
236+
237237
################
238238
## DATA PLANE ##
239239
################

‎charts/tractusx-connector/templates/deployment-dataplane.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,20 @@ spec:
147147
value: {{ .Values.dataplane.aws.accessKeyId | quote }}
148148
{{- end }}
149149

150+
###############
151+
## EDR CACHE ##
152+
###############
153+
154+
# see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql
155+
- name: "EDC_DATASOURCE_EDR_NAME"
156+
value: "edr"
157+
- name: "EDC_DATASOURCE_EDR_USER"
158+
value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
159+
- name: "EDC_DATASOURCE_EDR_PASSWORD"
160+
value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
161+
- name: "EDC_DATASOURCE_EDR_URL"
162+
value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
163+
150164
###########
151165
## VAULT ##
152166
###########

‎charts/tractusx-connector/templates/service-dataplane.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,10 @@ spec:
5151
targetPort: metrics
5252
protocol: TCP
5353
name: metrics
54+
- port: {{ .Values.dataplane.endpoints.proxy.port }}
55+
targetPort: proxy
56+
protocol: TCP
57+
name: proxy
58+
5459
selector:
5560
{{- include "txdc.dataplane.selectorLabels" . | nindent 4 }}

‎charts/tractusx-connector/values.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ imagePullSecrets: []
3434

3535
customLabels: {}
3636

37+
participant:
38+
id: ""
39+
3740
controlplane:
3841
image:
3942
# -- Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically
@@ -107,7 +110,7 @@ controlplane:
107110
# -- port for incoming api calls
108111
port: 8084
109112
# -- path for incoming api calls
110-
path: /api/v1/ids
113+
path: /api/v1/dsp
111114
# -- metrics api, used for application metrics, must not be internet facing
112115
metrics:
113116
# -- port for incoming api calls
@@ -340,6 +343,9 @@ dataplane:
340343
control:
341344
port: 8083
342345
path: /api/dataplane/control
346+
proxy:
347+
port: 8186
348+
path: /proxy
343349
observability:
344350
# -- port for incoming API calls
345351
port: 8085

0 commit comments

Comments
 (0)