feat(Identity): updated charts

eclipse-tractusx · May 28, 2023 · cb80327 · cb80327
1 parent 962c23a
commit cb80327
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 40 deletions.
diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
@@ -109,6 +109,12 @@ spec:
             {{- end }}
           {{- end }}
 
+            ########################
+            ## ID CONFIGURATION ##
+            ########################
+            - name: EDC_PARTICIPANT_ID
+              value: {{ .Values.participant.id | required ".Values.participant.id is required" | quote }}
+
             ########################
             ## DAPS CONFIGURATION ##
             ########################
@@ -154,31 +160,15 @@ spec:
               value: {{ .Values.controlplane.endpoints.observability.insecure | quote }}
 
             #########
-            ## IDS ##
+            ## DSP ##
             #########
-            - name: "IDS_WEBHOOK_ADDRESS"
-              value: {{ include "txdc.controlplane.url.protocol" . | quote }}
-            - name: "EDC_IDS_ENDPOINT"
+
+            - name: "EDC_DSP_CALLBACK_ADDRESS"
               value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" .) .Values.controlplane.endpoints.protocol.path | quote }}
-            - name: "EDC_IDS_ID"
-              value: {{ printf "urn:connector:%s" (lower .Values.controlplane.internationalDataSpaces.id) | quote }}
-            - name: "EDC_IDS_DESCRIPTION"
-              value: {{ .Values.controlplane.internationalDataSpaces.description | quote }}
-            - name: "EDC_IDS_TITLE"
-              value: {{ .Values.controlplane.internationalDataSpaces.title | quote }}
-            - name: "EDC_IDS_MAINTAINER"
-              value: {{ .Values.controlplane.internationalDataSpaces.maintainer | quote }}
-            - name: "EDC_IDS_CURATOR"
-              value: {{ .Values.controlplane.internationalDataSpaces.curator | quote }}
-            - name: "EDC_IDS_CATALOG_ID"
-              value: {{ printf "urn:catalog:%s" (lower .Values.controlplane.internationalDataSpaces.catalogId) | quote }}
             - name: "EDC_OAUTH_PROVIDER_AUDIENCE"
               value: "idsc:IDS_CONNECTORS_ALL"
             - name: "EDC_OAUTH_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
-            # this is the old setting name for 'EDC_OAUTH_ENDPOINT_AUDIENCE' and is mandatory for Produce EDC v0.1.2 and older
-            - name: "EDC_IDS_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
+              value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path | quote }}
 
             ################
             ## POSTGRESQL ##

diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml
@@ -34,6 +34,9 @@ imagePullSecrets: []
 
 customLabels: {}
 
+participant:
+  id: ""
+
 controlplane:
   image:
     # -- Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically

diff --git a/charts/tractusx-connector-memory/example.yaml b/charts/tractusx-connector-memory/example.yaml
@@ -32,6 +32,10 @@
 
 ---
 fullnameOverride: tx-inmem
+
+participant:
+  id: "test"
+
 runtime:
   service:
     type: NodePort

diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
@@ -109,6 +109,12 @@ spec:
             {{- end }}
           {{- end }}
 
+            ########################
+            ## ID CONFIGURATION ##
+            ########################
+            - name: EDC_PARTICIPANT_ID
+              value: {{ .Values.participant.id | required ".Values.participant.id is required" | quote }}
+
             ########################
             ## DAPS CONFIGURATION ##
             ########################
@@ -175,31 +181,15 @@ spec:
               value: {{ include "txdc.runtime.url.validation" .}}
 
             #########
-            ## IDS ##
+            ## DSP ##
             #########
-            - name: "IDS_WEBHOOK_ADDRESS"
-              value: {{ include "txdc.runtime.url.protocol" . | quote }}
-            - name: "EDC_IDS_ENDPOINT"
+
+            - name: "EDC_DSP_CALLBACK_ADDRESS"
               value: {{ printf "%s%s" (include "txdc.runtime.url.protocol" .) .Values.runtime.endpoints.protocol.path | quote }}
-            - name: "EDC_IDS_ID"
-              value: {{ printf "urn:connector:%s" (lower .Values.runtime.internationalDataSpaces.id) | quote }}
-            - name: "EDC_IDS_DESCRIPTION"
-              value: {{ .Values.runtime.internationalDataSpaces.description | quote }}
-            - name: "EDC_IDS_TITLE"
-              value: {{ .Values.runtime.internationalDataSpaces.title | quote }}
-            - name: "EDC_IDS_MAINTAINER"
-              value: {{ .Values.runtime.internationalDataSpaces.maintainer | quote }}
-            - name: "EDC_IDS_CURATOR"
-              value: {{ .Values.runtime.internationalDataSpaces.curator | quote }}
-            - name: "EDC_IDS_CATALOG_ID"
-              value: {{ printf "urn:catalog:%s" (lower .Values.runtime.internationalDataSpaces.catalogId) | quote }}
             - name: "EDC_OAUTH_PROVIDER_AUDIENCE"
               value: "idsc:IDS_CONNECTORS_ALL"
             - name: "EDC_OAUTH_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.runtime.url.protocol" . ) .Values.runtime.endpoints.protocol.path "/data" | quote }}
-            # this is the old setting name for 'EDC_OAUTH_ENDPOINT_AUDIENCE' and is mandatory for Produce EDC v0.1.2 and older
-            - name: "EDC_IDS_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.runtime.url.protocol" . ) .Values.runtime.endpoints.protocol.path "/data" | quote }}
+              value: {{ printf "%s%s" (include "txdc.runtime.url.protocol" . ) .Values.runtime.endpoints.protocol.path | quote }}
 
             ################
             ## DATA PLANE ##

diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml
@@ -31,6 +31,9 @@ imagePullSecrets: []
 
 customLabels: {}
 
+participant:
+  id: ""
+
 runtime:
   image:
     repository: ""

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
@@ -38,6 +38,9 @@ fullnameOverride: tx-prod
 ################################
 # EDC ControlPlane + DataPlane #
 ################################
+participant:
+  id: "test"
+
 controlplane:
   service:
     type: NodePort