From 99abeb2e75e9801351bbf40656735ec5f431d6c3 Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Mon, 11 Dec 2023 10:14:51 +0100 Subject: [PATCH] feat: increase EDR token validity --- charts/tractusx-connector-azure-vault/README.md | 1 + .../templates/deployment-controlplane.yaml | 2 ++ charts/tractusx-connector-azure-vault/values.yaml | 3 ++- charts/tractusx-connector-memory/README.md | 1 + .../templates/deployment-runtime.yaml | 2 ++ charts/tractusx-connector-memory/values.yaml | 3 ++- charts/tractusx-connector/README.md | 1 + .../tractusx-connector/templates/deployment-controlplane.yaml | 3 +++ charts/tractusx-connector/values.yaml | 3 ++- 9 files changed, 16 insertions(+), 3 deletions(-) diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md index 1dd5a53fb..92f5a1705 100644 --- a/charts/tractusx-connector-azure-vault/README.md +++ b/charts/tractusx-connector-azure-vault/README.md @@ -78,6 +78,7 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0. | controlplane.debug.enabled | bool | `false` | | | controlplane.debug.port | int | `1044` | | | controlplane.debug.suspendOnStart | bool | `false` | | +| controlplane.edr.transferProxyTokenValidity | int | `2592000` | | | controlplane.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"password","path":"/management","port":8081},"metrics":{"path":"/metrics","port":9090},"protocol":{"path":"/api/v1/dsp","port":8084}}` | endpoints of the control plane | | controlplane.endpoints.control | object | `{"path":"/control","port":8083}` | control api, used for internal control calls. can be added to the internal ingress, but should probably not | | controlplane.endpoints.control.path | string | `"/control"` | path for incoming api calls | diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml index 651e502a3..7e15f844a 100644 --- a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml +++ b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml @@ -298,6 +298,8 @@ spec: - name: "EDC_TRANSFER_PROXY_TOKEN_VERIFIER_PUBLICKEY_ALIAS" value: {{ .Values.vault.secretNames.transferProxyTokenSignerPublicKey | quote }} {{- end }} + - name: "EDC_TRANSFER_PROXY_TOKEN_VALIDITY_SECONDS" + value: {{ .Values.controlplane.edr.transferProxyTokenValidity | required ".Values.controlplane.edr.transferProxyTokenValidity is required" | quote }} # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/transfer/transfer-pull-http-dynamic-receiver diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml index 1673727e6..c8ead4464 100644 --- a/charts/tractusx-connector-azure-vault/values.yaml +++ b/charts/tractusx-connector-azure-vault/values.yaml @@ -117,7 +117,8 @@ controlplane: businessPartnerValidation: log: agreementValidation: true - + edr: + transferProxyTokenValidity: 2592000 # SSI configuration ssi: miw: diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md index a6be12542..315d3ef41 100644 --- a/charts/tractusx-connector-memory/README.md +++ b/charts/tractusx-connector-memory/README.md @@ -69,6 +69,7 @@ helm install my-release tractusx-edc/tractusx-connector-memory --version 0.6.0-r | runtime.debug.enabled | bool | `false` | | | runtime.debug.port | int | `1044` | | | runtime.debug.suspendOnStart | bool | `false` | | +| runtime.edr.transferProxyTokenValidity | int | `2592000` | | | runtime.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"password","path":"/management","port":8081},"protocol":{"path":"/api/v1/dsp","port":8084},"proxy":{"path":"/proxy","port":8186},"public":{"path":"/api/public","port":8086},"validation":{"path":"/validation","port":8082}}` | endpoints of the control plane | | runtime.endpoints.control | object | `{"path":"/control","port":8083}` | control api, used for internal control calls. can be added to the internal ingress, but should probably not | | runtime.endpoints.control.path | string | `"/control"` | path for incoming api calls | diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml index abb51e2bd..1929ba285 100644 --- a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml +++ b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml @@ -244,6 +244,8 @@ spec: - name: "EDC_TRANSFER_PROXY_TOKEN_VERIFIER_PUBLICKEY_ALIAS" value: {{ .Values.vault.secretNames.transferProxyTokenSignerPublicKey | quote }} {{- end }} + - name: "EDC_TRANSFER_PROXY_TOKEN_VALIDITY_SECONDS" + value: {{ .Values.runtime.edr.transferProxyTokenValidity | required ".Values.runtime.edr.transferProxyTokenValidity is required" | quote }} # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/http-receiver - name: "EDC_RECEIVER_HTTP_ENDPOINT" diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml index 14192a7ea..45f3401f1 100644 --- a/charts/tractusx-connector-memory/values.yaml +++ b/charts/tractusx-connector-memory/values.yaml @@ -118,7 +118,8 @@ runtime: businessPartnerValidation: log: agreementValidation: true - + edr: + transferProxyTokenValidity: 2592000 # SSI configuration ssi: miw: diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md index aafcd1832..d7f5e65fa 100644 --- a/charts/tractusx-connector/README.md +++ b/charts/tractusx-connector/README.md @@ -72,6 +72,7 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.6.0-rc2 \ | controlplane.debug.enabled | bool | `false` | | | controlplane.debug.port | int | `1044` | | | controlplane.debug.suspendOnStart | bool | `false` | | +| controlplane.edr.transferProxyTokenValidity | int | `2592000` | | | controlplane.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"password","path":"/management","port":8081},"metrics":{"path":"/metrics","port":9090},"protocol":{"path":"/api/v1/dsp","port":8084}}` | endpoints of the control plane | | controlplane.endpoints.control | object | `{"path":"/control","port":8083}` | control api, used for internal control calls. can be added to the internal ingress, but should probably not | | controlplane.endpoints.control.path | string | `"/control"` | path for incoming api calls | diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml index 22c54ba53..99a559208 100644 --- a/charts/tractusx-connector/templates/deployment-controlplane.yaml +++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml @@ -298,6 +298,9 @@ spec: - name: "EDC_TRANSFER_PROXY_TOKEN_VERIFIER_PUBLICKEY_ALIAS" value: {{ .Values.vault.secretNames.transferProxyTokenSignerPublicKey | quote }} {{- end }} + - name: "EDC_TRANSFER_PROXY_TOKEN_VALIDITY_SECONDS" + value: {{ .Values.controlplane.edr.transferProxyTokenValidity | required ".Values.controlplane.edr.transferProxyTokenValidity is required" | quote }} + # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/transfer/transfer-pull-http-dynamic-receiver - name: "EDC_RECEIVER_HTTP_DYNAMIC_ENDPOINT" diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml index 76b50711c..0a722d5f9 100644 --- a/charts/tractusx-connector/values.yaml +++ b/charts/tractusx-connector/values.yaml @@ -117,7 +117,8 @@ controlplane: businessPartnerValidation: log: agreementValidation: true - + edr: + transferProxyTokenValidity: 2592000 # SSI configuration ssi: miw: