From d36521421855b4407cf0be8280833ca1a0fba80d Mon Sep 17 00:00:00 2001 From: Kilian Haag Date: Fri, 15 Dec 2023 19:00:08 +0100 Subject: [PATCH 1/3] fix(helm): Remove deprecated/separate validation endpoint --- charts/tractusx-connector-memory/README.md | 5 +- .../templates/_helpers.tpl | 9 +- .../templates/deployment-runtime.yaml | 4 - .../templates/service-runtime.yaml | 4 - charts/tractusx-connector-memory/values.yaml | 6 - .../tractusx-connector/templates/_helpers.tpl | 364 +++++++++--------- .../00_local_setup_controlplane.md | 2 +- .../README.md | 6 +- .../README.md | 6 +- edc-controlplane/edc-runtime-memory/README.md | 6 +- .../edc-dataplane-azure-vault/README.md | 4 +- .../edc-dataplane-hashicorp-vault/README.md | 4 +- 12 files changed, 199 insertions(+), 221 deletions(-) diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md index 145340cb8..7ea7be814 100644 --- 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 index 9788b6641..997d6b5a4 100644 --- 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 }} + +{{/* +Runtime 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 index 1929ba285..5fdf7ddae 100644 --- 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 index c2d45e236..ce87d83a9 100644 --- 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 index 8c1d7c02b..c72ab13ae 100644 --- 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 diff --git a/charts/tractusx-connector/templates/_helpers.tpl b/charts/tractusx-connector/templates/_helpers.tpl index b3c570bb1..46bc283dc 100644 --- a/charts/tractusx-connector/templates/_helpers.tpl +++ b/charts/tractusx-connector/templates/_helpers.tpl @@ -1,182 +1,182 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "txdc.name" -}} -{{- default .Chart.Name .Values.nameOverride | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "txdc.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "txdc.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Control Common labels -*/}} -{{- define "txdc.labels" -}} -helm.sh/chart: {{ include "txdc.chart" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Control Common labels -*/}} -{{- define "txdc.controlplane.labels" -}} -helm.sh/chart: {{ include "txdc.chart" . }} -{{ include "txdc.controlplane.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -app.kubernetes.io/component: edc-controlplane -app.kubernetes.io/part-of: edc -{{- end }} - -{{/* -Data Common labels -*/}} -{{- define "txdc.dataplane.labels" -}} -helm.sh/chart: {{ include "txdc.chart" . }} -{{ include "txdc.dataplane.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -app.kubernetes.io/component: edc-dataplane -app.kubernetes.io/part-of: edc -{{- end }} - -{{/* -Control Selector labels -*/}} -{{- define "txdc.controlplane.selectorLabels" -}} -app.kubernetes.io/name: {{ include "txdc.name" . }}-controlplane -app.kubernetes.io/instance: {{ .Release.Name }}-controlplane -{{- end }} - -{{/* -Data Selector labels -*/}} -{{- define "txdc.dataplane.selectorLabels" -}} -app.kubernetes.io/name: {{ include "txdc.name" . }}-dataplane -app.kubernetes.io/instance: {{ .Release.Name }}-dataplane -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "txdc.controlplane.serviceaccount.name" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "txdc.fullname" . ) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "txdc.dataplane.serviceaccount.name" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "txdc.fullname" . ) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} - -{{/* -Control DSP URL -*/}} -{{- define "txdc.controlplane.url.protocol" -}} -{{- if .Values.controlplane.url.protocol }}{{/* if dsp api url has been specified explicitly */}} -{{- .Values.controlplane.url.protocol }} -{{- else }}{{/* else when dsp api url has not been specified explicitly */}} -{{- with (index .Values.controlplane.ingresses 0) }} -{{- if .enabled }}{{/* if ingress enabled */}} -{{- if .tls.enabled }}{{/* if TLS enabled */}} -{{- printf "https://%s" .hostname -}} -{{- else }}{{/* else when TLS not enabled */}} -{{- printf "http://%s" .hostname -}} -{{- end }}{{/* end if tls */}} -{{- else }}{{/* else when ingress not enabled */}} -{{- printf "http://%s-controlplane:%v" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.protocol.port -}} -{{- end }}{{/* end if ingress */}} -{{- end }}{{/* end with ingress */}} -{{- end }}{{/* end if .Values.controlplane.url.protocol */}} -{{- end }} - -{{/* -Validation URL -*/}} -{{- define "txdc.controlplane.url.validation" -}} -{{- printf "http://%s-controlplane:%v%s/token" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.control.port $.Values.controlplane.endpoints.control.path -}} -{{- end }} - -{{/* -Control Plane URL -*/}} -{{- define "txdc.controlplane.url.control" -}} -{{- printf "http://%s-controlplane:%v%s" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.control.port $.Values.controlplane.endpoints.control.path -}} -{{- end }} - -{{/* -Data Control URL -*/}} -{{- define "txdc.dataplane.url.control" -}} -{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" . ) .Values.dataplane.endpoints.control.port .Values.dataplane.endpoints.control.path -}} -{{- end }} - -{{/* -Data Public URL -*/}} -{{- define "txdc.dataplane.url.public" -}} -{{- if .Values.dataplane.url.public }}{{/* if public api url has been specified explicitly */}} -{{- .Values.dataplane.url.public }} -{{- else }}{{/* else when public api url has not been specified explicitly */}} -{{- with (index .Values.dataplane.ingresses 0) }} -{{- if .enabled }}{{/* if ingress enabled */}} -{{- if .tls.enabled }}{{/* if TLS enabled */}} -{{- printf "https://%s%s" .hostname $.Values.dataplane.endpoints.public.path -}} -{{- else }}{{/* else when TLS not enabled */}} -{{- printf "http://%s%s" .hostname $.Values.dataplane.endpoints.public.path -}} -{{- end }}{{/* end if tls */}} -{{- else }}{{/* else when ingress not enabled */}} -{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" $ ) $.Values.dataplane.endpoints.public.port $.Values.dataplane.endpoints.public.path -}} -{{- end }}{{/* end if ingress */}} -{{- end }}{{/* end with ingress */}} -{{- end }}{{/* end if .Values.dataplane.url.public */}} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "txdc.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "txdc.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} +{{/* +Expand the name of the chart. +*/}} +{{- define "txdc.name" -}} +{{- default .Chart.Name .Values.nameOverride | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "txdc.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "txdc.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Control Common labels +*/}} +{{- define "txdc.labels" -}} +helm.sh/chart: {{ include "txdc.chart" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Control Common labels +*/}} +{{- define "txdc.controlplane.labels" -}} +helm.sh/chart: {{ include "txdc.chart" . }} +{{ include "txdc.controlplane.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +app.kubernetes.io/component: edc-controlplane +app.kubernetes.io/part-of: edc +{{- end }} + +{{/* +Data Common labels +*/}} +{{- define "txdc.dataplane.labels" -}} +helm.sh/chart: {{ include "txdc.chart" . }} +{{ include "txdc.dataplane.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +app.kubernetes.io/component: edc-dataplane +app.kubernetes.io/part-of: edc +{{- end }} + +{{/* +Control Selector labels +*/}} +{{- define "txdc.controlplane.selectorLabels" -}} +app.kubernetes.io/name: {{ include "txdc.name" . }}-controlplane +app.kubernetes.io/instance: {{ .Release.Name }}-controlplane +{{- end }} + +{{/* +Data Selector labels +*/}} +{{- define "txdc.dataplane.selectorLabels" -}} +app.kubernetes.io/name: {{ include "txdc.name" . }}-dataplane +app.kubernetes.io/instance: {{ .Release.Name }}-dataplane +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "txdc.controlplane.serviceaccount.name" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "txdc.fullname" . ) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "txdc.dataplane.serviceaccount.name" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "txdc.fullname" . ) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} + +{{/* +Control DSP URL +*/}} +{{- define "txdc.controlplane.url.protocol" -}} +{{- if .Values.controlplane.url.protocol }}{{/* if dsp api url has been specified explicitly */}} +{{- .Values.controlplane.url.protocol }} +{{- else }}{{/* else when dsp api url has not been specified explicitly */}} +{{- with (index .Values.controlplane.ingresses 0) }} +{{- if .enabled }}{{/* if ingress enabled */}} +{{- if .tls.enabled }}{{/* if TLS enabled */}} +{{- printf "https://%s" .hostname -}} +{{- else }}{{/* else when TLS not enabled */}} +{{- printf "http://%s" .hostname -}} +{{- end }}{{/* end if tls */}} +{{- else }}{{/* else when ingress not enabled */}} +{{- printf "http://%s-controlplane:%v" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.protocol.port -}} +{{- end }}{{/* end if ingress */}} +{{- end }}{{/* end with ingress */}} +{{- end }}{{/* end if .Values.controlplane.url.protocol */}} +{{- end }} + +{{/* +Validation URL +*/}} +{{- define "txdc.controlplane.url.validation" -}} +{{- printf "%s/token" ( include "txdc.controlplane.url.control" $ ) -}} +{{- end }} + +{{/* +Control Plane URL +*/}} +{{- define "txdc.controlplane.url.control" -}} +{{- printf "http://%s-controlplane:%v%s" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.control.port $.Values.controlplane.endpoints.control.path -}} +{{- end }} + +{{/* +Data Control URL +*/}} +{{- define "txdc.dataplane.url.control" -}} +{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" . ) .Values.dataplane.endpoints.control.port .Values.dataplane.endpoints.control.path -}} +{{- end }} + +{{/* +Data Public URL +*/}} +{{- define "txdc.dataplane.url.public" -}} +{{- if .Values.dataplane.url.public }}{{/* if public api url has been specified explicitly */}} +{{- .Values.dataplane.url.public }} +{{- else }}{{/* else when public api url has not been specified explicitly */}} +{{- with (index .Values.dataplane.ingresses 0) }} +{{- if .enabled }}{{/* if ingress enabled */}} +{{- if .tls.enabled }}{{/* if TLS enabled */}} +{{- printf "https://%s%s" .hostname $.Values.dataplane.endpoints.public.path -}} +{{- else }}{{/* else when TLS not enabled */}} +{{- printf "http://%s%s" .hostname $.Values.dataplane.endpoints.public.path -}} +{{- end }}{{/* end if tls */}} +{{- else }}{{/* else when ingress not enabled */}} +{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" $ ) $.Values.dataplane.endpoints.public.port $.Values.dataplane.endpoints.public.path -}} +{{- end }}{{/* end if ingress */}} +{{- end }}{{/* end with ingress */}} +{{- end }}{{/* end if .Values.dataplane.url.public */}} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "txdc.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "txdc.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/docs/kit/Operation View/02_Local Setup/00_local_setup_controlplane.md b/docs/kit/Operation View/02_Local Setup/00_local_setup_controlplane.md index 1ee5059a8..9de21147f 100644 --- a/docs/kit/Operation View/02_Local Setup/00_local_setup_controlplane.md +++ b/docs/kit/Operation View/02_Local Setup/00_local_setup_controlplane.md @@ -127,7 +127,7 @@ Once the configuration is created, the container can be run directly via docker. ```shell docker run \ - -p 8080:8080 -p 8181:8181 -p 8182:8182 -p 8282:8282 -p 9090:9090 -p 9999:9999 \ + -p 8080:8080 -p 8181:8181 -p 8282:8282 -p 9090:9090 -p 9999:9999 \ -v ${CONFIGURATION_PROPERTIES_FILE:-/dev/null}:/app/configuration.properties \ -v ${LOGGING_PROPERTIES_FILE:-/dev/null}:/app/logging.properties \ -v ${OPENTELEMETRY_PROPERTIES_FILE:-/dev/null}:/app/opentelemetry.properties \ diff --git a/edc-controlplane/edc-controlplane-postgresql-azure-vault/README.md b/edc-controlplane/edc-controlplane-postgresql-azure-vault/README.md index ac6275657..ff163cb54 100644 --- a/edc-controlplane/edc-controlplane-postgresql-azure-vault/README.md +++ b/edc-controlplane/edc-controlplane-postgresql-azure-vault/README.md @@ -20,8 +20,6 @@ Details regarding each configuration property can be found at the [documentary s | web.http.default.path | X | /api | | | web.http.data.port | X | 8181 | | | web.http.data.path | X | | | -| web.http.validation.port | X | 8182 | | -| web.http.validation.path | X | /validation | | | web.http.control.port | X | 9999 | | | web.http.control.path | X | /api/controlplane/control | | | web.http.ids.port | X | 8282 | | @@ -77,8 +75,6 @@ web.http.default.port=8080 web.http.default.path=/api web.http.data.port=8181 web.http.data.path=/data -web.http.validation.port=8182 -web.http.validation.path=/validation web.http.control.port=9999 web.http.control.path=/api/controlplane/control web.http.ids.port=8282 @@ -165,7 +161,7 @@ EOF ```shell docker run \ - -p 8080:8080 -p 8181:8181 -p 8182:8182 -p 8282:8282 -p 9090:9090 -p 9999:9999 \ + -p 8080:8080 -p 8181:8181 -p 8282:8282 -p 9090:9090 -p 9999:9999 \ -v ${CONFIGURATION_PROPERTIES_FILE:-/dev/null}:/app/configuration.properties \ -v ${LOGGING_PROPERTIES_FILE:-/dev/null}:/app/logging.properties \ -v ${OPENTELEMETRY_PROPERTIES_FILE:-/dev/null}:/app/opentelemetry.properties \ diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/README.md b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/README.md index 564ac7101..3655f0c88 100644 --- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/README.md +++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/README.md @@ -20,8 +20,6 @@ Details regarding each configuration property can be found at the [documentary s | web.http.default.path | X | /api | | | web.http.data.port | X | 8181 | | | web.http.data.path | X | /data | | -| web.http.validation.port | X | 8182 | | -| web.http.validation.path | X | /validation | | | web.http.control.port | X | 9999 | | | web.http.control.path | X | /api/controlplane/control | | | web.http.ids.port | X | 8282 | | @@ -76,8 +74,6 @@ web.http.default.port=8080 web.http.default.path=/api web.http.data.port=8181 web.http.data.path=/data -web.http.validation.port=8182 -web.http.validation.path=/validation web.http.control.port=9999 web.http.control.path=/api/controlplane/control web.http.ids.port=8282 @@ -162,7 +158,7 @@ EOF ```shell docker run \ - -p 8080:8080 -p 8181:8181 -p 8182:8182 -p 8282:8282 -p 9090:9090 -p 9999:9999 \ + -p 8080:8080 -p 8181:8181 -p 8282:8282 -p 9090:9090 -p 9999:9999 \ -v ${CONFIGURATION_PROPERTIES_FILE:-/dev/null}:/app/configuration.properties \ -v ${LOGGING_PROPERTIES_FILE:-/dev/null}:/app/logging.properties \ -v ${OPENTELEMETRY_PROPERTIES_FILE:-/dev/null}:/app/opentelemetry.properties \ diff --git a/edc-controlplane/edc-runtime-memory/README.md b/edc-controlplane/edc-runtime-memory/README.md index 377f566c2..b356fa206 100644 --- a/edc-controlplane/edc-runtime-memory/README.md +++ b/edc-controlplane/edc-runtime-memory/README.md @@ -31,8 +31,6 @@ the [documentary section of the EDC](https://github.com/eclipse-edc/Connector/tr | web.http.default.path | X | /api | | | web.http.data.port | X | 8181 | | | web.http.data.path | X | /data | | -| web.http.validation.port | X | 8182 | | -| web.http.validation.path | X | /validation | | | web.http.control.port | X | 9999 | | | web.http.control.path | X | /api/controlplane/control | | | web.http.ids.port | X | 8282 | | @@ -65,8 +63,6 @@ web.http.default.port=8080 web.http.default.path=/api web.http.data.port=8181 web.http.data.path=/data -web.http.validation.port=8182 -web.http.validation.path=/validation web.http.control.port=9999 web.http.control.path=/api/controlplane/control web.http.ids.port=8282 @@ -114,7 +110,7 @@ EOF ```shell docker run \ -e SECRETS="key1:secret1,key2:secret2" \ - -p 8080:8080 -p 8181:8181 -p 8182:8182 -p 8282:8282 -p 9090:9090 -p 9999:9999 \ + -p 8080:8080 -p 8181:8181 -p 8282:8282 -p 9090:9090 -p 9999:9999 \ -v ${CONFIGURATION_PROPERTIES_FILE:-/dev/null}:/app/configuration.properties \ -v ${LOGGING_PROPERTIES_FILE:-/dev/null}:/app/logging.properties \ -i edc-runtime-memory:latest diff --git a/edc-dataplane/edc-dataplane-azure-vault/README.md b/edc-dataplane/edc-dataplane-azure-vault/README.md index 255adfa26..470301c2a 100644 --- a/edc-dataplane/edc-dataplane-azure-vault/README.md +++ b/edc-dataplane/edc-dataplane-azure-vault/README.md @@ -27,7 +27,7 @@ Details regarding each configuration property can be found at the [documentary s | edc.vault.tenantid | X | 55555555-6666-7777-8888-999999999999 | | | edc.vault.name | X | my-vault-name | | | edc.vault.clientsecret | X | 34-chars-secret | | -| edc.dataplane.token.validation.endpoint | X | | | +| edc.dataplane.token.validation.endpoint | X | | | ### Example configuration.properties @@ -46,7 +46,7 @@ web.http.control.port=9999 web.http.control.path=/api/dataplane/control # Validation endpoint of controlplane -edc.dataplane.token.validation.endpoint=http://controlplane:8182/validation/token +edc.dataplane.token.validation.endpoint=http://controlplane:9999/control/token # EDC hostname edc.hostname=localhost diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/README.md b/edc-dataplane/edc-dataplane-hashicorp-vault/README.md index 49da83d76..55a42b471 100644 --- a/edc-dataplane/edc-dataplane-hashicorp-vault/README.md +++ b/edc-dataplane/edc-dataplane-hashicorp-vault/README.md @@ -26,7 +26,7 @@ Details regarding each configuration property can be found at the [documentary s | edc.vault.hashicorp.url | X | | | | edc.vault.hashicorp.token | X | 55555555-6666-7777-8888-999999999999 | | | edc.vault.hashicorp.timeout.seconds | | 30 | | -| edc.dataplane.token.validation.endpoint | X | | | +| edc.dataplane.token.validation.endpoint | X | | | ### Example configuration.properties @@ -45,7 +45,7 @@ web.http.control.port=9999 web.http.control.path=/api/dataplane/control # Validation endpoint of controlplane -edc.dataplane.token.validation.endpoint=http://controlplane:8182/validation/token +edc.dataplane.token.validation.endpoint=http://controlplane:9999/control/token # EDC hostname edc.hostname=localhost From d60d9f98e01b3f720d8ec2e645e1e7431e4c7a29 Mon Sep 17 00:00:00 2001 From: KilianHaag Date: Mon, 8 Jan 2024 13:56:50 +0100 Subject: [PATCH 2/3] Update charts/tractusx-connector-memory/templates/_helpers.tpl Co-authored-by: ndr_brt --- charts/tractusx-connector-memory/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tractusx-connector-memory/templates/_helpers.tpl b/charts/tractusx-connector-memory/templates/_helpers.tpl index 997d6b5a4..c65ba8c52 100644 --- a/charts/tractusx-connector-memory/templates/_helpers.tpl +++ b/charts/tractusx-connector-memory/templates/_helpers.tpl @@ -111,7 +111,7 @@ Validation URL {{- end }} {{/* -Runtime URL +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 -}} From abcc0010e33cab4bb56c969663fc7a7a75cd2d1a Mon Sep 17 00:00:00 2001 From: Kilian Haag Date: Mon, 8 Jan 2024 15:50:24 +0100 Subject: [PATCH 3/3] chore(deps): Update DEPENDENCIES --- DEPENDENCIES | 104 +++++++++++++++++++++++++-------------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 0ab3ea8d9..125e85eab 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -449,59 +449,59 @@ maven/mavencentral/org.testcontainers/testcontainers/1.19.3, Apache-2.0 AND MIT, maven/mavencentral/org.testcontainers/vault/1.19.3, MIT, approved, #10852 maven/mavencentral/org.yaml/snakeyaml/2.0, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #7275 maven/mavencentral/org.yaml/snakeyaml/2.2, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #10232 -maven/mavencentral/software.amazon.awssdk/annotations/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/annotations/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/apache-client/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/apache-client/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/arns/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/arns/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/auth/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/auth/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/aws-core/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/aws-core/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/checksums-spi/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/checksums-spi/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/checksums/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/checksums/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/crt-core/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/crt-core/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/http-auth-aws/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/http-auth-aws/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/http-auth-spi/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/http-auth-spi/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/http-auth/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/http-auth/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/http-client-spi/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/http-client-spi/2.22.9, , restricted, clearlydefined +maven/mavencentral/software.amazon.awssdk/annotations/2.22.6, Apache-2.0, approved, #12618 +maven/mavencentral/software.amazon.awssdk/annotations/2.22.9, Apache-2.0, approved, #12618 +maven/mavencentral/software.amazon.awssdk/apache-client/2.22.6, Apache-2.0, approved, #12633 +maven/mavencentral/software.amazon.awssdk/apache-client/2.22.9, Apache-2.0, approved, #12633 +maven/mavencentral/software.amazon.awssdk/arns/2.22.6, Apache-2.0, approved, #12647 +maven/mavencentral/software.amazon.awssdk/arns/2.22.9, Apache-2.0, approved, #12647 +maven/mavencentral/software.amazon.awssdk/auth/2.22.6, Apache-2.0, approved, #12622 +maven/mavencentral/software.amazon.awssdk/auth/2.22.9, Apache-2.0, approved, #12622 +maven/mavencentral/software.amazon.awssdk/aws-core/2.22.6, Apache-2.0, approved, #12640 +maven/mavencentral/software.amazon.awssdk/aws-core/2.22.9, Apache-2.0, approved, #12640 +maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.22.6, Apache-2.0, approved, #12645 +maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.22.9, Apache-2.0, approved, #12645 +maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.22.6, Apache-2.0, approved, #12628 +maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.22.9, Apache-2.0, approved, #12628 +maven/mavencentral/software.amazon.awssdk/checksums-spi/2.22.6, Apache-2.0, approved, #12642 +maven/mavencentral/software.amazon.awssdk/checksums-spi/2.22.9, Apache-2.0, approved, #12642 +maven/mavencentral/software.amazon.awssdk/checksums/2.22.6, Apache-2.0, approved, #12641 +maven/mavencentral/software.amazon.awssdk/checksums/2.22.9, Apache-2.0, approved, #12641 +maven/mavencentral/software.amazon.awssdk/crt-core/2.22.6, Apache-2.0, approved, #12635 +maven/mavencentral/software.amazon.awssdk/crt-core/2.22.9, Apache-2.0, approved, #12635 +maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.22.6, Apache-2.0, approved, #12624 +maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.22.9, Apache-2.0, approved, #12624 +maven/mavencentral/software.amazon.awssdk/http-auth-aws/2.22.6, Apache-2.0, approved, #12637 +maven/mavencentral/software.amazon.awssdk/http-auth-aws/2.22.9, Apache-2.0, approved, #12637 +maven/mavencentral/software.amazon.awssdk/http-auth-spi/2.22.6, Apache-2.0, approved, #12638 +maven/mavencentral/software.amazon.awssdk/http-auth-spi/2.22.9, Apache-2.0, approved, #12638 +maven/mavencentral/software.amazon.awssdk/http-auth/2.22.6, Apache-2.0, approved, #12626 +maven/mavencentral/software.amazon.awssdk/http-auth/2.22.9, Apache-2.0, approved, #12626 +maven/mavencentral/software.amazon.awssdk/http-client-spi/2.22.6, Apache-2.0, approved, #12627 +maven/mavencentral/software.amazon.awssdk/http-client-spi/2.22.9, Apache-2.0, approved, #12627 maven/mavencentral/software.amazon.awssdk/iam/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/identity-spi/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/identity-spi/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/json-utils/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/json-utils/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/metrics-spi/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/metrics-spi/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/profiles/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/profiles/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/protocol-core/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/protocol-core/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/regions/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/regions/2.22.9, , restricted, clearlydefined +maven/mavencentral/software.amazon.awssdk/identity-spi/2.22.6, Apache-2.0, approved, #12636 +maven/mavencentral/software.amazon.awssdk/identity-spi/2.22.9, Apache-2.0, approved, #12636 +maven/mavencentral/software.amazon.awssdk/json-utils/2.22.6, Apache-2.0, approved, #12646 +maven/mavencentral/software.amazon.awssdk/json-utils/2.22.9, Apache-2.0, approved, #12646 +maven/mavencentral/software.amazon.awssdk/metrics-spi/2.22.6, Apache-2.0, approved, #12649 +maven/mavencentral/software.amazon.awssdk/metrics-spi/2.22.9, Apache-2.0, approved, #12649 +maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.22.6, Apache-2.0, approved, #12644 +maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.22.9, Apache-2.0, approved, #12644 +maven/mavencentral/software.amazon.awssdk/profiles/2.22.6, Apache-2.0, approved, #12620 +maven/mavencentral/software.amazon.awssdk/profiles/2.22.9, Apache-2.0, approved, #12620 +maven/mavencentral/software.amazon.awssdk/protocol-core/2.22.6, Apache-2.0, approved, #12648 +maven/mavencentral/software.amazon.awssdk/protocol-core/2.22.9, Apache-2.0, approved, #12648 +maven/mavencentral/software.amazon.awssdk/regions/2.22.6, Apache-2.0, approved, #12643 +maven/mavencentral/software.amazon.awssdk/regions/2.22.9, Apache-2.0, approved, #12643 maven/mavencentral/software.amazon.awssdk/s3-transfer-manager/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/s3/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/s3/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/sdk-core/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/sdk-core/2.22.9, , restricted, clearlydefined +maven/mavencentral/software.amazon.awssdk/s3/2.22.6, Apache-2.0, approved, #12630 +maven/mavencentral/software.amazon.awssdk/s3/2.22.9, Apache-2.0, approved, #12630 +maven/mavencentral/software.amazon.awssdk/sdk-core/2.22.6, Apache-2.0, approved, #12639 +maven/mavencentral/software.amazon.awssdk/sdk-core/2.22.9, Apache-2.0, approved, #12639 maven/mavencentral/software.amazon.awssdk/sts/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.22.9, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/utils/2.22.6, , restricted, clearlydefined -maven/mavencentral/software.amazon.awssdk/utils/2.22.9, , restricted, clearlydefined +maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.22.6, Apache-2.0, approved, #12629 +maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.22.9, Apache-2.0, approved, #12629 +maven/mavencentral/software.amazon.awssdk/utils/2.22.6, Apache-2.0, approved, #12631 +maven/mavencentral/software.amazon.awssdk/utils/2.22.9, Apache-2.0, approved, #12631 maven/mavencentral/software.amazon.eventstream/eventstream/1.0.1, Apache-2.0, approved, clearlydefined