fix merge conflict left overs

eclipse-tractusx · May 31, 2024 · 6efa437 · 6efa437
1 parent 3bbf6ed
commit 6efa437
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md
@@ -173,16 +173,13 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
 | dataplane.debug.enabled | bool | `false` | Enables java debugging mode. |
 | dataplane.debug.port | int | `1044` | Port where the debuggee can connect to. |
 | dataplane.debug.suspendOnStart | bool | `false` | Defines if the JVM should wait with starting the application until someone connected to the debugging port. |
-| dataplane.endpoints | object | `{"default":{"path":"/api","port":8080},"metrics":{"path":"/metrics","port":9090},"proxy":{"authKey":"password","path":"/proxy","port":8186},"public":{"path":"/api/public","port":8081},"signaling":{"path":"/api/signaling","port":8083}}` | endpoints of the dataplane |
-| dataplane.endpoints.control.path | string | `"/api/control"` |  |
-| dataplane.endpoints.control.port | int | `8084` |  |
+| dataplane.endpoints | object | `{"control":{"path":"/api/control","port":8084},"default":{"path":"/api","port":8080},"metrics":{"path":"/metrics","port":9090},"proxy":{"authKey":"password","path":"/proxy","port":8186},"public":{"path":"/api/public","port":8081}}` | endpoints of the dataplane |
 | dataplane.endpoints.default | object | `{"path":"/api","port":8080}` | default api for health checks, should not be added to any ingress |
 | dataplane.endpoints.default.path | string | `"/api"` | path for incoming api calls |
 | dataplane.endpoints.default.port | int | `8080` | port for incoming api calls |
 | dataplane.endpoints.metrics | object | `{"path":"/metrics","port":9090}` | metrics api, used for application metrics, must not be internet facing |
 | dataplane.endpoints.metrics.path | string | `"/metrics"` | path for incoming api calls |
 | dataplane.endpoints.metrics.port | int | `9090` | port for incoming api calls |
-| dataplane.endpoints.proxy | object | `{"authKey":"password","path":"/proxy","port":8186}` | proxy API |
 | dataplane.endpoints.proxy.authKey | string | `"password"` | authentication key, must be attached to each request as `X-Api-Key` header |
 | dataplane.endpoints.proxy.path | string | `"/proxy"` | path for incoming api calls |
 | dataplane.endpoints.proxy.port | int | `8186` | port for incoming api calls |
@@ -285,7 +282,7 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
 | vault.azure.client | string | `nil` |  |
 | vault.azure.name | string | `"<AZURE_NAME>"` |  |
 | vault.azure.secret | string | `nil` |  |
-| vault.azure.tenant | string | `"<AZURE_TENANT_ID>"` |  |
+| vault.azure.tenant | string | `nil` |  |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs/)
diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md
@@ -77,7 +77,7 @@ helm install my-release tractusx-edc/tractusx-connector-memory --version 0.7.2 \
 | runtime.debug.enabled | bool | `false` | Enables java debugging mode. |
 | runtime.debug.port | int | `1044` | Port where the debuggee can connect to. |
 | runtime.debug.suspendOnStart | bool | `false` | Defines if the JVM should wait with starting the application until someone connected to the debugging port. |
-| 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},"signaling":{"path":"/api/signaling","port":8087}}` | endpoints of the controlplane |
+| 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 controlplane |
 | 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 |
@@ -91,7 +91,8 @@ 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.proxy | object | `{"path":"/proxy","port":8186}` | proxy API |
+| runtime.endpoints.proxy | object | `{"authKey":"password","path":"/proxy","port":8186}` | proxy API |
+| runtime.endpoints.proxy.authKey | string | `"password"` | authentication key, must be attached to each request as `X-Api-Key` header |
 | runtime.endpoints.proxy.path | string | `"/proxy"` | path for incoming api calls |
 | runtime.endpoints.proxy.port | int | `8186` | port for incoming api calls |
 | runtime.endpoints.public | object | `{"path":"/api/public","port":8086}` | public endpoint where the data can be fetched from if HttpPull was used. Must be internet facing. |

diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md
@@ -174,16 +174,13 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.7.2 \
 | dataplane.debug.enabled | bool | `false` | Enables java debugging mode. |
 | dataplane.debug.port | int | `1044` | Port where the debuggee can connect to. |
 | dataplane.debug.suspendOnStart | bool | `false` | Defines if the JVM should wait with starting the application until someone connected to the debugging port. |
-| dataplane.endpoints | object | `{"default":{"path":"/api","port":8080},"metrics":{"path":"/metrics","port":9090},"proxy":{"authKey":"password","path":"/proxy","port":8186},"public":{"path":"/api/public","port":8081},"signaling":{"path":"/api/signaling","port":8083}}` | endpoints of the dataplane |
-| dataplane.endpoints.control.path | string | `"/api/control"` |  |
-| dataplane.endpoints.control.port | int | `8084` |  |
+| dataplane.endpoints | object | `{"control":{"path":"/api/control","port":8084},"default":{"path":"/api","port":8080},"metrics":{"path":"/metrics","port":9090},"proxy":{"authKey":"password","path":"/proxy","port":8186},"public":{"path":"/api/public","port":8081}}` | endpoints of the dataplane |
 | dataplane.endpoints.default | object | `{"path":"/api","port":8080}` | default api for health checks, should not be added to any ingress |
 | dataplane.endpoints.default.path | string | `"/api"` | path for incoming api calls |
 | dataplane.endpoints.default.port | int | `8080` | port for incoming api calls |
 | dataplane.endpoints.metrics | object | `{"path":"/metrics","port":9090}` | metrics api, used for application metrics, must not be internet facing |
 | dataplane.endpoints.metrics.path | string | `"/metrics"` | path for incoming api calls |
 | dataplane.endpoints.metrics.port | int | `9090` | port for incoming api calls |
-| dataplane.endpoints.proxy | object | `{"authKey":"password","path":"/proxy","port":8186}` | proxy API |
 | dataplane.endpoints.proxy.authKey | string | `"password"` | authentication key, must be attached to each request as `X-Api-Key` header |
 | dataplane.endpoints.proxy.path | string | `"/proxy"` | path for incoming api calls |
 | dataplane.endpoints.proxy.port | int | `8186` | port for incoming api calls |