Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(helm): Remove deprecated/separate validation endpoint #937

Merged
merged 4 commits into from
Jan 9, 2024
Merged

fix(helm): Remove deprecated/separate validation endpoint #937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d365214
fix(helm): Remove deprecated/separate validation endpoint
KilianHaag Dec 15, 2023
d60d9f9
Update charts/tractusx-connector-memory/templates/_helpers.tpl
KilianHaag Jan 8, 2024
c911e83
Merge branch 'eclipse-tractusx:main' into fix/helm-remove-validation-…
KilianHaag Jan 8, 2024
abcc001
chore(deps): Update DEPENDENCIES
KilianHaag Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 52 additions & 52 deletions DEPENDENCIES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
maven/mavencentral/com.apicatalog/carbon-did/0.0.2, Apache-2.0, approved, #9239

Check warning on line 1 in DEPENDENCIES

View workflow job for this annotation

GitHub Actions / verify / verify-dependencies / Dash-Verify-Licenses

Restricted Dependencies found 

Some dependencies are marked 'restricted' - please review them
maven/mavencentral/com.apicatalog/iron-verifiable-credentials/0.8.1, Apache-2.0, approved, #9234
maven/mavencentral/com.apicatalog/titanium-json-ld/1.0.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.apicatalog/titanium-json-ld/1.3.1, Apache-2.0, approved, #8912
Expand Down Expand Up @@ -449,59 +449,59 @@
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
5 changes: 1 addition & 4 deletions charts/tractusx-connector-memory/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand All @@ -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 | `[]` | |
Expand Down
9 changes: 8 additions & 1 deletion charts/tractusx-connector-memory/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

{{/*
Expand Down
4 changes: 0 additions & 4 deletions charts/tractusx-connector-memory/templates/deployment-runtime.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions charts/tractusx-connector-memory/templates/service-runtime.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions charts/tractusx-connector-memory/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading