From 72b17f8049459bd01c0201554a9359b4e1089524 Mon Sep 17 00:00:00 2001 From: adkumar1 Date: Tue, 14 May 2024 19:07:01 +0530 Subject: [PATCH 1/2] addition of secret --- charts/data-exchange/Chart.yaml | 2 +- charts/data-exchange/templates/deployment.yaml | 11 ++++++++--- charts/data-exchange/templates/secret.yaml | 5 +++-- charts/data-exchange/values-beta.yaml | 5 +++-- charts/data-exchange/values-dev.yaml | 5 +++-- charts/data-exchange/values-int.yaml | 5 +++-- charts/data-exchange/values-pen.yaml | 5 +++-- charts/data-exchange/values-stable.yaml | 5 +++-- charts/data-exchange/values.yaml | 6 ++++-- 9 files changed, 31 insertions(+), 18 deletions(-) diff --git a/charts/data-exchange/Chart.yaml b/charts/data-exchange/Chart.yaml index 65879ef..aca643e 100644 --- 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/templates/deployment.yaml b/charts/data-exchange/templates/deployment.yaml index 2ec28e0..abcb3b2 100644 --- 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 index 63e4679..b8b8758 100644 --- 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 index 589b8bc..fff0553 100644 --- 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: "" edcapikey: "" e2edetsurl: "" + edcid: "" diff --git a/charts/data-exchange/values-dev.yaml b/charts/data-exchange/values-dev.yaml index 1c0849e..dad323e 100644 --- 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: "" edcapikey: "" e2edetsurl: "" + edcid: "" diff --git a/charts/data-exchange/values-int.yaml b/charts/data-exchange/values-int.yaml index 485abfc..4f76923 100644 --- 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: "" edcapikey: "" e2edetsurl: "" + edcid: "" diff --git a/charts/data-exchange/values-pen.yaml b/charts/data-exchange/values-pen.yaml index cc6c332..33a45d6 100644 --- 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: "" edcapikey: "" e2edetsurl: "" + edcid: "" diff --git a/charts/data-exchange/values-stable.yaml b/charts/data-exchange/values-stable.yaml index 3015a1b..e894eba 100644 --- 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: "" edcapikey: "" e2edetsurl: "" + edcid: "" diff --git a/charts/data-exchange/values.yaml b/charts/data-exchange/values.yaml index f1ee5af..641fe54 100644 --- 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: From 3eeac19e9b964befb61fc1774f740466dfddb320 Mon Sep 17 00:00:00 2001 From: adkumar1 Date: Tue, 14 May 2024 19:07:41 +0530 Subject: [PATCH 2/2] bump version --- README.md | 2 +- charts/data-exchange/README.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5fc1190..ada5cbb 100644 --- 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/README.md b/charts/data-exchange/README.md index e71a342..11f65d9 100644 --- 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 |