refactor: remove deprecated signaling api context configuration

eclipse-tractusx · May 28, 2024 · 88de2ea · 88de2ea
1 parent 29bb4a8
commit 88de2ea
Show file tree

Hide file tree

Showing 16 changed files with 2 additions and 66 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -70,8 +70,6 @@ participant's control plane and data plane.
 | `dataplane.token.refresh.refresh_endpoint`         | `TX_EDC_DATAPLANE_TOKEN_REFRESH_ENDPOINT`           |          | `<PUBLIC_API>/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`
+    - `EDC_VAULT_CERTIFICATE` was replaced by `AZURE_CLIENT_CERTIFICATE_PATH`