Merge pull request eclipse-tractusx#72 from catenax-ng/edc_variable

chore: Addition of secret
catenax-ng · May 14, 2024 · cae3e17 · cae3e17
2 parents 7a582ea + 3eeac19
commit cae3e17
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ This service will help for testing the connectors and also can be used for healt
 
 ### Software Version
 ```shell
-Latest Helm version is v1.0.15
+Latest Helm version is v1.0.16
 Latest Application version is v1.0.12
 ```
 ### How to run

diff --git a/charts/data-exchange/Chart.yaml b/charts/data-exchange/Chart.yaml
@@ -38,7 +38,7 @@ sources:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.15
+version: 1.0.16
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/data-exchange/README.md b/charts/data-exchange/README.md
@@ -1,6 +1,6 @@
 # data-exchange
 
-![Version: 1.0.15](https://img.shields.io/badge/Version-1.0.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.12](https://img.shields.io/badge/AppVersion-1.0.12-informational?style=flat-square)
+![Version: 1.0.16](https://img.shields.io/badge/Version-1.0.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.12](https://img.shields.io/badge/AppVersion-1.0.12-informational?style=flat-square)
 
 Data exchange service is used to exchange the data between connectors
 
@@ -21,6 +21,7 @@ Data exchange service is used to exchange the data between connectors
 | dataex.secret.edcapikey | string | `""` | Key for EDC API |
 | dataex.secret.edcapikeyheader | string | `""` | Header for EDC |
 | dataex.secret.edchostname | string | `""` | EDC connector Hostname |
+| dataex.secret.edcid | string | `""` | BPN for E2E data exchange test service |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"Always"` | Set the Image Pull Policy |
 | image.repository | string | `"tractusx/data-exchange-test-service"` | Image to use for deploying an application |

diff --git a/charts/data-exchange/templates/deployment.yaml b/charts/data-exchange/templates/deployment.yaml
@@ -1,7 +1,7 @@
 ---
 #################################################################################
-# Copyright (c) 2022,2023 T-Systems International GmbH
-# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2024 T-Systems International GmbH
+# Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -79,7 +79,12 @@ spec:
               secretKeyRef:
                 name: {{ include "data-exchange.applicationSecret.name" . }}
                 key: e2edetsurl
-
+          - name: DEFAULT_EDC_ID
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "data-exchange.applicationSecret.name" . }}
+                key: edcid
+
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}

diff --git a/charts/data-exchange/templates/secret.yaml b/charts/data-exchange/templates/secret.yaml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2022,2023 T-Systems International GmbH
-# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2024 T-Systems International GmbH
+# Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -28,3 +28,4 @@ stringData:
   edcapikeyheader: {{ .Values.dataex.secret.edcapikeyheader | default (randAlphaNum 16) }}
   edcapikey: {{ .Values.dataex.secret.edcapikey | default (printf "%s-%s" "edcapikey" (randAlpha 6)) }}
   e2edetsurl: {{ .Values.dataex.secret.e2edetsurl | default "https://e2edets-url" }}
+  edcid: {{ .Values.dataex.secret.edcid | default (randAlphaNum 16) }}
diff --git a/charts/data-exchange/values-beta.yaml b/charts/data-exchange/values-beta.yaml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2022,2023 T-Systems International GmbH
-# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2024 T-Systems International GmbH
+# Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -51,3 +51,4 @@ dataex:
     edcapikeyheader: "<path:essential-services/data/data-exchange-beta#edcapikeyheader>"
     edcapikey: "<path:essential-services/data/data-exchange-beta#edcapikey>"
     e2edetsurl: "<path:essential-services/data/data-exchange-beta#e2edetsurl>"
+    edcid: "<path:essential-services/data/data-exchange-beta#edcid>"
diff --git a/charts/data-exchange/values-dev.yaml b/charts/data-exchange/values-dev.yaml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2022,2023 T-Systems International GmbH
-# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2024 T-Systems International GmbH
+# Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -51,3 +51,4 @@ dataex:
     edcapikeyheader: "<path:essential-services/data/data-exchange-dev#edcapikeyheader>"
     edcapikey: "<path:essential-services/data/data-exchange-dev#edcapikey>"
     e2edetsurl: "<path:essential-services/data/data-exchange-dev#e2edetsurl>"
+    edcid: "<path:essential-services/data/data-exchange-dev#edcid>"
diff --git a/charts/data-exchange/values-int.yaml b/charts/data-exchange/values-int.yaml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2022,2023 T-Systems International GmbH
-# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2024 T-Systems International GmbH
+# Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -51,3 +51,4 @@ dataex:
     edcapikeyheader: "<path:essential-services/data/data-exchange#edcapikeyheader>"
     edcapikey: "<path:essential-services/data/data-exchange#edcapikey>"
     e2edetsurl: "<path:essential-services/data/data-exchange#e2edetsurl>"
+    edcid: "<path:essential-services/data/data-exchange#edcid>"
diff --git a/charts/data-exchange/values-pen.yaml b/charts/data-exchange/values-pen.yaml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2022,2023 T-Systems International GmbH
-# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2024 T-Systems International GmbH
+# Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -51,3 +51,4 @@ dataex:
     edcapikeyheader: "<path:essential-services/data/data-exchange-pen#edcapikeyheader>"
     edcapikey: "<path:essential-services/data/data-exchange-pen#edcapikey>"
     e2edetsurl: "<path:essential-services/data/data-exchange-pen#e2edetsurl>"
+    edcid: "<path:essential-services/data/data-exchange-pen#edcid>"
diff --git a/charts/data-exchange/values-stable.yaml b/charts/data-exchange/values-stable.yaml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2022,2023 T-Systems International GmbH
-# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2024 T-Systems International GmbH
+# Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -51,3 +51,4 @@ dataex:
     edcapikeyheader: "<path:essential-services/data/data-exchange-stable#edcapikeyheader>"
     edcapikey: "<path:essential-services/data/data-exchange-stable#edcapikey>"
     e2edetsurl: "<path:essential-services/data/data-exchange-stable#e2edetsurl>"
+    edcid: "<path:essential-services/data/data-exchange-stable#edcid>"
diff --git a/charts/data-exchange/values.yaml b/charts/data-exchange/values.yaml
@@ -1,6 +1,6 @@
 #################################################################################
-# Copyright (c) 2022,2023 T-Systems International GmbH
-# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2024 T-Systems International GmbH
+# Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -98,6 +98,8 @@ dataex:
     edcapikey: ""
     # -- URL for E2E data exchange test service
     e2edetsurl: ""
+    # -- BPN for E2E data exchange test service
+    edcid: ""
 
 resources:
   limits: