From 426d870137091e416b2f344fc7db937ce8038401 Mon Sep 17 00:00:00 2001 From: Mathias Brunkow Moser Date: Fri, 10 May 2024 10:32:19 +0200 Subject: [PATCH 1/5] chore(charts): updated just chart version --- charts/digital-product-pass/Chart.yaml | 2 +- charts/digital-product-pass/templates/configmap-backend.yaml | 2 +- charts/digital-product-pass/values-int.yaml | 2 +- charts/digital-product-pass/values.yaml | 2 +- .../digital-product-pass-backend/templates/configmap.yaml | 2 +- dpp-backend/charts/digital-product-pass-backend/values-int.yaml | 2 +- dpp-backend/charts/digital-product-pass-backend/values.yaml | 2 +- .../tractusx/digitalproductpass/config/SingleApiConfig.java | 2 +- .../digitalproductpass/src/main/resources/application.yml | 2 +- .../digitalproductpass/src/test/resources/application-test.yml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charts/digital-product-pass/Chart.yaml b/charts/digital-product-pass/Chart.yaml index d9ff9ebae..aff830514 100644 --- a/charts/digital-product-pass/Chart.yaml +++ b/charts/digital-product-pass/Chart.yaml @@ -42,7 +42,7 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.3.0 +version: 2.3.2 # 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/digital-product-pass/templates/configmap-backend.yaml b/charts/digital-product-pass/templates/configmap-backend.yaml index 5c5e9436e..76fd3bb42 100644 --- a/charts/digital-product-pass/templates/configmap-backend.yaml +++ b/charts/digital-product-pass/templates/configmap-backend.yaml @@ -126,7 +126,7 @@ data: edc: key: {{ tpl (.Values.backend.discovery.edcDiscovery.key | default "bpn") . | quote }} # -- configuration to the single API endpoint - singleApi: + single-api: maxRetries: {{ .Values.backend.singleApi.maxRetries }} delay: {{ .Values.backend.singleApi.delay }} # -- process configuration diff --git a/charts/digital-product-pass/values-int.yaml b/charts/digital-product-pass/values-int.yaml index 6df28ed1b..52c5d1444 100644 --- a/charts/digital-product-pass/values-int.yaml +++ b/charts/digital-product-pass/values-int.yaml @@ -62,7 +62,7 @@ backend: discovery: hostname: "semantics.int.demo.catena-x.net/discoveryfinder" - singleApi: + single-api: maxRetries: 30 delay: 1000 diff --git a/charts/digital-product-pass/values.yaml b/charts/digital-product-pass/values.yaml index beb5b9428..a802ee789 100644 --- a/charts/digital-product-pass/values.yaml +++ b/charts/digital-product-pass/values.yaml @@ -255,7 +255,7 @@ backend: edcDiscovery: key: "bpn" # -- configuration to the single API endpoint - singleApi: + single-api: maxRetries: 30 delay: 1000 diff --git a/dpp-backend/charts/digital-product-pass-backend/templates/configmap.yaml b/dpp-backend/charts/digital-product-pass-backend/templates/configmap.yaml index d2516d26a..96d105d8d 100644 --- a/dpp-backend/charts/digital-product-pass-backend/templates/configmap.yaml +++ b/dpp-backend/charts/digital-product-pass-backend/templates/configmap.yaml @@ -127,7 +127,7 @@ data: edc: key: {{ tpl (.Values.discovery.edcDiscovery.key | default "bpn") . | quote }} # -- configuration to the single API endpoint - singleApi: + single-api: maxRetries: {{ .Values.singleApi.maxRetries }} delay: {{ .Values.singleApi.delay }} # -- process configuration diff --git a/dpp-backend/charts/digital-product-pass-backend/values-int.yaml b/dpp-backend/charts/digital-product-pass-backend/values-int.yaml index 927a70e19..e51e09534 100644 --- a/dpp-backend/charts/digital-product-pass-backend/values-int.yaml +++ b/dpp-backend/charts/digital-product-pass-backend/values-int.yaml @@ -60,7 +60,7 @@ process: discovery: hostname: "semantics.int.demo.catena-x.net/discoveryfinder" -singleApi: +single-api: maxRetries: 30 delay: 1000 diff --git a/dpp-backend/charts/digital-product-pass-backend/values.yaml b/dpp-backend/charts/digital-product-pass-backend/values.yaml index 93aea3d00..7bb62806e 100644 --- a/dpp-backend/charts/digital-product-pass-backend/values.yaml +++ b/dpp-backend/charts/digital-product-pass-backend/values.yaml @@ -176,7 +176,7 @@ discovery: edcDiscovery: key: "bpn" # -- configuration to the single API endpoint -singleApi: +single-api: maxRetries: 30 delay: 1000 diff --git a/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/SingleApiConfig.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/SingleApiConfig.java index 6774e9868..346414857 100644 --- a/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/SingleApiConfig.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/SingleApiConfig.java @@ -33,7 +33,7 @@ * This class consists exclusively to define the attributes and methods needed for the Simple API configuration. **/ @Configuration -@ConfigurationProperties(prefix="configuration.singleApi") +@ConfigurationProperties(prefix="configuration.single-api") public class SingleApiConfig { /** ATTRIBUTES **/ diff --git a/dpp-backend/digitalproductpass/src/main/resources/application.yml b/dpp-backend/digitalproductpass/src/main/resources/application.yml index 91e6f08ee..e31aacf78 100644 --- a/dpp-backend/digitalproductpass/src/main/resources/application.yml +++ b/dpp-backend/digitalproductpass/src/main/resources/application.yml @@ -128,7 +128,7 @@ configuration: key: "bpn" timeout: 1500 - singleApi: + single-api: maxRetries: 30 delay: 1000 diff --git a/dpp-backend/digitalproductpass/src/test/resources/application-test.yml b/dpp-backend/digitalproductpass/src/test/resources/application-test.yml index 21ca961d9..c70f7ec24 100644 --- a/dpp-backend/digitalproductpass/src/test/resources/application-test.yml +++ b/dpp-backend/digitalproductpass/src/test/resources/application-test.yml @@ -128,7 +128,7 @@ configuration: key: "bpn" timeout: 1500 - singleApi: + single-api: maxRetries: 30 delay: 1000 From c8e79f43b3df645ebef6a07e8d90771276d454c9 Mon Sep 17 00:00:00 2001 From: Mathias Brunkow Moser Date: Fri, 10 May 2024 10:33:15 +0200 Subject: [PATCH 2/5] chore(charts): updated chart version --- charts/digital-product-pass/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/digital-product-pass/Chart.yaml b/charts/digital-product-pass/Chart.yaml index d9ff9ebae..ba2645bb1 100644 --- a/charts/digital-product-pass/Chart.yaml +++ b/charts/digital-product-pass/Chart.yaml @@ -42,7 +42,7 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.3.0 +version: 2.3.1 # 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 From cce58cf187f823b703ec702efd95e01911f64e85 Mon Sep 17 00:00:00 2001 From: Mathias Brunkow Moser Date: Fri, 10 May 2024 10:42:08 +0200 Subject: [PATCH 3/5] fix(helm): fixed issue with the helm templates --- .../digital-product-pass/templates/configmap-backend.yaml | 4 ++-- charts/digital-product-pass/values.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/digital-product-pass/templates/configmap-backend.yaml b/charts/digital-product-pass/templates/configmap-backend.yaml index 417b03dd6..6f422bc8d 100644 --- a/charts/digital-product-pass/templates/configmap-backend.yaml +++ b/charts/digital-product-pass/templates/configmap-backend.yaml @@ -25,8 +25,8 @@ apiVersion: v1 kind: ConfigMap metadata: - name: { { .Release.Name } }-backend-config - namespace: { { .Values.namespace } } + name: {{ .Release.Name }}-backend-config + namespace: {{ .Values.namespace }} data: application.yaml: |- spring: diff --git a/charts/digital-product-pass/values.yaml b/charts/digital-product-pass/values.yaml index 10317f71e..03ea1e2ea 100644 --- a/charts/digital-product-pass/values.yaml +++ b/charts/digital-product-pass/values.yaml @@ -205,8 +205,8 @@ backend: - leftOperand: "cx-policy:UsagePurpose" operator: "odrl:eq" rightOperand: "cx.circular.dpp:1" - prohibition: [ ] - obligation: [ ] + prohibition: [] + obligation: [] digitalTwinRegistry: endpoints: search: "/lookup/shells" @@ -241,8 +241,8 @@ backend: - leftOperand: "cx-policy:UsagePurpose" operator: "odrl:eq" rightOperand: "cx.core.digitalTwinRegistry:1" - prohibition: [ ] - obligation: [ ] + prohibition: [] + obligation: [] # -- discovery configuration discovery: # -- discovery finder configuration From beafc44731f22d6cd6524de19be3baf7ab5fe4d2 Mon Sep 17 00:00:00 2001 From: Mathias Brunkow Moser Date: Fri, 10 May 2024 10:49:25 +0200 Subject: [PATCH 4/5] chore: fixed property in values file --- charts/digital-product-pass/templates/configmap-backend.yaml | 4 ++-- charts/digital-product-pass/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/digital-product-pass/templates/configmap-backend.yaml b/charts/digital-product-pass/templates/configmap-backend.yaml index 1963e17a0..76fd3bb42 100644 --- a/charts/digital-product-pass/templates/configmap-backend.yaml +++ b/charts/digital-product-pass/templates/configmap-backend.yaml @@ -127,8 +127,8 @@ data: key: {{ tpl (.Values.backend.discovery.edcDiscovery.key | default "bpn") . | quote }} # -- configuration to the single API endpoint single-api: - maxRetries: {{ .Values.backend.single-api.maxRetries }} - delay: {{ .Values.backend.single-api.delay }} + maxRetries: {{ .Values.backend.singleApi.maxRetries }} + delay: {{ .Values.backend.singleApi.delay }} # -- process configuration process: # -- directory for storing the contract negotiation files diff --git a/charts/digital-product-pass/values.yaml b/charts/digital-product-pass/values.yaml index 17f50611c..299c1beb1 100644 --- a/charts/digital-product-pass/values.yaml +++ b/charts/digital-product-pass/values.yaml @@ -255,7 +255,7 @@ backend: edcDiscovery: key: "bpn" # -- configuration to the single API endpoint - single-api: + singleApi: maxRetries: 30 delay: 1000 From 2ba12e36e34591b11a4874053605cc4436ae45a8 Mon Sep 17 00:00:00 2001 From: Mathias Brunkow Moser Date: Fri, 10 May 2024 10:52:45 +0200 Subject: [PATCH 5/5] feat: updated chart version to martch previous changes --- charts/digital-product-pass/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/digital-product-pass/Chart.yaml b/charts/digital-product-pass/Chart.yaml index aff830514..e0822b687 100644 --- a/charts/digital-product-pass/Chart.yaml +++ b/charts/digital-product-pass/Chart.yaml @@ -42,7 +42,7 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.3.2 +version: 2.3.3 # 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