Merge pull request #937 from KilianHaag/fix/helm-remove-validation-en…

…dpoint fix(helm): Remove deprecated/separate validation endpoint
eclipse-tractusx · Jan 9, 2024 · eb3bbd9 · eb3bbd9
2 parents d7adb17 + abcc001
commit eb3bbd9
Show file tree

Hide file tree

Showing 12 changed files with 199 additions and 221 deletions.
diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md
@@ -70,7 +70,7 @@ helm install my-release tractusx-edc/tractusx-connector-memory --version 0.6.0-r
 | runtime.debug.port | int | `1044` |  |
 | runtime.debug.suspendOnStart | bool | `false` |  |
 | runtime.edr.transferProxyTokenValidity | string | `"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 | 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}}` | 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 |
@@ -84,9 +84,6 @@ helm install my-release tractusx-edc/tractusx-connector-memory --version 0.6.0-r
 | 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.validation | object | `{"path":"/validation","port":8082}` | validation api, only used by the data plane and should not be added to any ingress |
-| runtime.endpoints.validation.path | string | `"/validation"` | path for incoming api calls |
-| runtime.endpoints.validation.port | int | `8082` | 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
@@ -107,7 +107,14 @@ Control DSP URL
 Validation URL
 */}}
 {{- define "txdc.runtime.url.validation" -}}
-{{- printf "http://%s-runtime:%v%s/token" ( include "txdc.fullname" $ ) $.Values.runtime.endpoints.validation.port $.Values.runtime.endpoints.validation.path -}}
+{{- printf "%s/token" ( include "txdc.runtime.url.control" $ ) -}}
+{{- end }}
+
+{{/*
+Control URL
+*/}}
+{{- define "txdc.runtime.url.control" -}}
+{{- printf "http://%s-runtime:%v%s" ( include "txdc.fullname" $ ) $.Values.runtime.endpoints.control.port $.Values.runtime.endpoints.control.path -}}
 {{- end }}
 
 {{/*

diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
@@ -188,10 +188,6 @@ spec:
             - name: "WEB_HTTP_MANAGEMENT_PATH"
               value: {{ .Values.runtime.endpoints.management.path | quote }}
             {{- end }}
-            - name: "WEB_HTTP_VALIDATION_PORT"
-              value: {{ .Values.runtime.endpoints.validation.port | quote }}
-            - name: "WEB_HTTP_VALIDATION_PATH"
-              value: {{ .Values.runtime.endpoints.validation.path | quote }}
             - name: "WEB_HTTP_CONTROL_PORT"
               value: {{ .Values.runtime.endpoints.control.port | quote }}
             - name: "WEB_HTTP_CONTROL_PATH"

diff --git a/charts/tractusx-connector-memory/templates/service-runtime.yaml b/charts/tractusx-connector-memory/templates/service-runtime.yaml
@@ -43,10 +43,6 @@ spec:
       targetPort: management
       protocol: TCP
       name: management
-    - port: {{ .Values.runtime.endpoints.validation.port }}
-      targetPort: validation
-      protocol: TCP
-      name: validation
     - port: {{ .Values.runtime.endpoints.protocol.port }}
       targetPort: protocol
       protocol: TCP

diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml
@@ -91,12 +91,6 @@ runtime:
       path: /management
       # -- authentication key, must be attached to each 'X-Api-Key' request header
       authKey: "password"
-    # -- validation api, only used by the data plane and should not be added to any ingress
-    validation:
-      # -- port for incoming api calls
-      port: 8082
-      # -- path for incoming api calls
-      path: /validation
     # -- control api, used for internal control calls. can be added to the internal ingress, but should probably not
     control:
       # -- port for incoming api calls