From 88de2ea7dc0ea9ed8b4184937ead77ff35d44824 Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Mon, 27 May 2024 12:17:01 +0200 Subject: [PATCH] refactor: remove deprecated signaling api context configuration --- charts/tractusx-connector-azure-vault/README.md | 2 -- .../tractusx-connector-azure-vault/templates/_helpers.tpl | 7 ------- .../templates/deployment-dataplane.yaml | 4 ---- .../templates/service-dataplane.yaml | 4 ---- charts/tractusx-connector-azure-vault/values.yaml | 3 --- charts/tractusx-connector-memory/README.md | 4 +--- charts/tractusx-connector-memory/templates/_helpers.tpl | 7 ------- .../templates/deployment-runtime.yaml | 4 ---- .../templates/service-runtime.yaml | 4 ---- charts/tractusx-connector-memory/values.yaml | 5 ----- charts/tractusx-connector/README.md | 2 -- charts/tractusx-connector/templates/_helpers.tpl | 7 ------- .../tractusx-connector/templates/deployment-dataplane.yaml | 4 ---- charts/tractusx-connector/templates/service-dataplane.yaml | 4 ---- charts/tractusx-connector/values.yaml | 3 --- docs/migration/Version_0.5.x_0.7.x.md | 4 +--- 16 files changed, 2 insertions(+), 66 deletions(-) diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md index 0363a6548..1acbdcb9a 100644 --- a/charts/tractusx-connector-azure-vault/README.md +++ b/charts/tractusx-connector-azure-vault/README.md @@ -188,8 +188,6 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0. | dataplane.endpoints.proxy.port | int | `8186` | | | dataplane.endpoints.public.path | string | `"/api/public"` | | | dataplane.endpoints.public.port | int | `8081` | | -| dataplane.endpoints.signaling.path | string | `"/api/signaling"` | | -| dataplane.endpoints.signaling.port | int | `8083` | | | dataplane.env | object | `{}` | | | dataplane.envConfigMapNames | list | `[]` | | | dataplane.envSecretNames | list | `[]` | | diff --git a/charts/tractusx-connector-azure-vault/templates/_helpers.tpl b/charts/tractusx-connector-azure-vault/templates/_helpers.tpl index 17cfe381d..fdc58cce1 100644 --- a/charts/tractusx-connector-azure-vault/templates/_helpers.tpl +++ b/charts/tractusx-connector-azure-vault/templates/_helpers.tpl @@ -150,13 +150,6 @@ Data Plane Control URL {{- printf "http://%s-dataplane:%v%s" ( include "txdc.fullname" $ ) $.Values.dataplane.endpoints.control.port $.Values.dataplane.endpoints.control.path -}} {{- end }} -{{/* -Data Signaling URL -*/}} -{{- define "txdc.dataplane.url.signaling" -}} -{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" . ) .Values.dataplane.endpoints.signaling.port .Values.dataplane.endpoints.signaling.path -}} -{{- end }} - {{/* Data Public URL */}} diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml index a5f27f0e7..6e56595cb 100644 --- a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml +++ b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml @@ -157,10 +157,6 @@ spec: value: {{ .Values.dataplane.endpoints.default.port | quote }} - name: "WEB_HTTP_DEFAULT_PATH" value: {{ .Values.dataplane.endpoints.default.path | quote }} - - name: "WEB_HTTP_SIGNALING_PORT" - value: {{ .Values.dataplane.endpoints.signaling.port | quote }} - - name: "WEB_HTTP_SIGNALING_PATH" - value: {{ .Values.dataplane.endpoints.signaling.path | quote }} - name: "WEB_HTTP_CONTROL_PORT" value: {{ .Values.dataplane.endpoints.control.port | quote }} - name: "WEB_HTTP_CONTROL_PATH" diff --git a/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml index f44182b96..14230b9de 100644 --- a/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml +++ b/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml @@ -32,10 +32,6 @@ spec: targetPort: default protocol: TCP name: default - - port: {{ .Values.dataplane.endpoints.signaling.port }} - targetPort: signaling - protocol: TCP - name: signaling - port: {{ .Values.dataplane.endpoints.control.port }} targetPort: control protocol: TCP diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml index 7e7da4294..3886de42c 100644 --- a/charts/tractusx-connector-azure-vault/values.yaml +++ b/charts/tractusx-connector-azure-vault/values.yaml @@ -355,9 +355,6 @@ dataplane: public: port: 8081 path: /api/public - signaling: - port: 8083 - path: /api/signaling control: port: 8084 path: /api/control diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md index 875ed6853..6fa6270da 100644 --- a/charts/tractusx-connector-memory/README.md +++ b/charts/tractusx-connector-memory/README.md @@ -79,7 +79,7 @@ helm install my-release tractusx-edc/tractusx-connector-memory --version 0.7.2 \ | runtime.debug.enabled | bool | `false` | | | runtime.debug.port | int | `1044` | | | runtime.debug.suspendOnStart | bool | `false` | | -| 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":{"authKey":"password","path":"/proxy","port":8186},"public":{"path":"/api/public","port":8086},"signaling":{"path":"/api/signaling","port":8087}}` | endpoints of the control plane | +| 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":{"authKey":"password","path":"/proxy","port":8186},"public":{"path":"/api/public","port":8086}}` | 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 | | runtime.endpoints.control.port | int | `8083` | port for incoming api calls | @@ -93,8 +93,6 @@ helm install my-release tractusx-edc/tractusx-connector-memory --version 0.7.2 \ | runtime.endpoints.protocol | object | `{"path":"/api/v1/dsp","port":8084}` | dsp api, used for inter connector communication and must be internet facing | | runtime.endpoints.protocol.path | string | `"/api/v1/dsp"` | path for incoming api calls | | runtime.endpoints.protocol.port | int | `8084` | port for incoming api calls | -| runtime.endpoints.signaling.path | string | `"/api/signaling"` | path for incoming api calls | -| runtime.endpoints.signaling.port | int | `8087` | port for incoming api calls | | runtime.env | object | `{}` | | | runtime.envConfigMapNames | list | `[]` | | | runtime.envSecretNames | list | `[]` | | diff --git a/charts/tractusx-connector-memory/templates/_helpers.tpl b/charts/tractusx-connector-memory/templates/_helpers.tpl index 84f590f08..4451da9ca 100644 --- a/charts/tractusx-connector-memory/templates/_helpers.tpl +++ b/charts/tractusx-connector-memory/templates/_helpers.tpl @@ -117,13 +117,6 @@ Control URL {{- printf "http://%s-runtime:%v%s" ( include "txdc.fullname" $ ) $.Values.runtime.endpoints.control.port $.Values.runtime.endpoints.control.path -}} {{- end }} -{{/* -Data Signaling URL -*/}} -{{- define "txdc.dataplane.url.signaling" -}} -{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" . ) .Values.runtime.endpoints.signaling.port .Values.runtime.endpoints.signaling.path -}} -{{- end }} - {{/* Data Public URL */}} diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml index 6ceda26ac..91dfb5993 100644 --- a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml +++ b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml @@ -179,10 +179,6 @@ spec: value: {{ .Values.runtime.endpoints.control.port | quote }} - name: "WEB_HTTP_CONTROL_PATH" value: {{ .Values.runtime.endpoints.control.path | quote }} - - name: "WEB_HTTP_SIGNALING_PORT" - value: {{ .Values.runtime.endpoints.signaling.port | quote }} - - name: "WEB_HTTP_SIGNALING_PATH" - value: {{ .Values.runtime.endpoints.signaling.path | quote }} - name: "WEB_HTTP_PROTOCOL_PORT" value: {{ .Values.runtime.endpoints.protocol.port | quote }} - name: "WEB_HTTP_PROTOCOL_PATH" diff --git a/charts/tractusx-connector-memory/templates/service-runtime.yaml b/charts/tractusx-connector-memory/templates/service-runtime.yaml index e7536bbcb..d6c441b85 100644 --- a/charts/tractusx-connector-memory/templates/service-runtime.yaml +++ b/charts/tractusx-connector-memory/templates/service-runtime.yaml @@ -51,9 +51,5 @@ spec: targetPort: public protocol: TCP name: public - - port: {{ .Values.runtime.endpoints.signaling.port }} - targetPort: signaling - protocol: TCP - name: signaling selector: {{- include "txdc.runtime.selectorLabels" . | nindent 4 }} diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml index d888d9d91..d1b3d50b8 100644 --- a/charts/tractusx-connector-memory/values.yaml +++ b/charts/tractusx-connector-memory/values.yaml @@ -124,11 +124,6 @@ runtime: port: 8186 path: /proxy authKey: "password" - signaling: - # -- port for incoming api calls - port: 8087 - # -- path for incoming api calls - path: /api/signaling businessPartnerValidation: log: diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md index fb5f3b8ca..16f99ed04 100644 --- a/charts/tractusx-connector/README.md +++ b/charts/tractusx-connector/README.md @@ -185,8 +185,6 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.7.2 \ | dataplane.endpoints.proxy.port | int | `8186` | | | dataplane.endpoints.public.path | string | `"/api/public"` | | | dataplane.endpoints.public.port | int | `8081` | | -| dataplane.endpoints.signaling.path | string | `"/api/signaling"` | | -| dataplane.endpoints.signaling.port | int | `8083` | | | dataplane.env | object | `{}` | | | dataplane.envConfigMapNames | list | `[]` | | | dataplane.envSecretNames | list | `[]` | | diff --git a/charts/tractusx-connector/templates/_helpers.tpl b/charts/tractusx-connector/templates/_helpers.tpl index ec85aa19e..a115b2215 100644 --- a/charts/tractusx-connector/templates/_helpers.tpl +++ b/charts/tractusx-connector/templates/_helpers.tpl @@ -149,13 +149,6 @@ Data Plane Control URL {{- printf "http://%s-dataplane:%v%s" ( include "txdc.fullname" $ ) $.Values.dataplane.endpoints.control.port $.Values.dataplane.endpoints.control.path -}} {{- end }} -{{/* -Data Signaling URL -*/}} -{{- define "txdc.dataplane.url.signaling" -}} -{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" . ) .Values.dataplane.endpoints.signaling.port .Values.dataplane.endpoints.signaling.path -}} -{{- end }} - {{/* Data Public URL */}} diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml index b1a747030..48dbb24b7 100644 --- a/charts/tractusx-connector/templates/deployment-dataplane.yaml +++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml @@ -157,10 +157,6 @@ spec: value: {{ .Values.dataplane.endpoints.default.port | quote }} - name: "WEB_HTTP_DEFAULT_PATH" value: {{ .Values.dataplane.endpoints.default.path | quote }} - - name: "WEB_HTTP_SIGNALING_PORT" - value: {{ .Values.dataplane.endpoints.signaling.port | quote }} - - name: "WEB_HTTP_SIGNALING_PATH" - value: {{ .Values.dataplane.endpoints.signaling.path | quote }} - name: "WEB_HTTP_CONTROL_PORT" value: {{ .Values.dataplane.endpoints.control.port | quote }} - name: "WEB_HTTP_CONTROL_PATH" diff --git a/charts/tractusx-connector/templates/service-dataplane.yaml b/charts/tractusx-connector/templates/service-dataplane.yaml index 83cf99a52..0f1fc5e8c 100644 --- a/charts/tractusx-connector/templates/service-dataplane.yaml +++ b/charts/tractusx-connector/templates/service-dataplane.yaml @@ -36,10 +36,6 @@ spec: targetPort: default protocol: TCP name: default - - port: {{ .Values.dataplane.endpoints.signaling.port }} - targetPort: signaling - protocol: TCP - name: signaling - port: {{ .Values.dataplane.endpoints.control.port }} targetPort: control protocol: TCP diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml index 754bb3f2e..bbccfd65b 100644 --- a/charts/tractusx-connector/values.yaml +++ b/charts/tractusx-connector/values.yaml @@ -353,9 +353,6 @@ dataplane: public: port: 8081 path: /api/public - signaling: - port: 8083 - path: /api/signaling control: port: 8084 path: /api/control diff --git a/docs/migration/Version_0.5.x_0.7.x.md b/docs/migration/Version_0.5.x_0.7.x.md index 8a4816213..95c35aa18 100644 --- a/docs/migration/Version_0.5.x_0.7.x.md +++ b/docs/migration/Version_0.5.x_0.7.x.md @@ -70,8 +70,6 @@ participant's control plane and data plane. | `dataplane.token.refresh.refresh_endpoint` | `TX_EDC_DATAPLANE_TOKEN_REFRESH_ENDPOINT` | | `/token` | endpoint for an OAuth2 token refresh request | | `dataplane.token.signer.privatekey_alias` | `EDC_TRANSFER_PROXY_TOKEN_SIGNER_PRIVATEKEY_ALIAS` | x | | alias, under which the private key is stored in the vault | | `dataplane.token.verifier.publickey_alias` | `EDC_TRANSFER_PROXY_TOKEN_VERIFIER_PUBLICKEY_ALIAS` | x | | alias, under which the public key is stored in the vault | -| `dataplane.endpoints.signaling.port` | `WEB_HTTP_SIGNALING_PORT` | | 8083 | port where the Signaling API is exposed | -| `dataplane.endpoints.signaling.path` | `WEB_HTTP_SIGNALING_PATH` | | `/api/signaling` | path where the Signaling API is exposed | ### 1.6 Further references @@ -335,4 +333,4 @@ the [EDR API documentation](https://github.com/eclipse-tractusx/tractusx-edc/blo - `EDC_VAULT_CLIENTID` was replaced by `AZURE_CLIENT_ID` - `EDC_VAULT_TENANTID` was replaced by `AZURE_TENANT_ID` - `EDC_VAULT_CLIENTSECRET` was replaced by `AZURE_CLIENT_SECRET` - - `EDC_VAULT_CERTIFICATE` was replaced by `AZURE_CLIENT_CERTIFICATE_PATH` \ No newline at end of file + - `EDC_VAULT_CERTIFICATE` was replaced by `AZURE_CLIENT_CERTIFICATE_PATH`