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

improvement(memory-edc): remove EDC_VAULT_SECRETS rewrite #1040

Merged
merged 2 commits into from
Feb 18, 2024
Merged

improvement(memory-edc): remove EDC_VAULT_SECRETS rewrite #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
354426c
improvement(memory-chart): remove EC_VAULT_SECRETS rewrite
KilianHaag Feb 9, 2024
99e32c4
improvement(memory-chart): remove EDC_VAULT_SECRETS rewrite
KilianHaag Feb 9, 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
2 changes: 1 addition & 1 deletion 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 @@ -252,7 +252,7 @@ spec:
###########

# see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/hashicorp-vault
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this URL is not valid anymore.

- name: "SECRETS"
- name: "EDC_VAULT_SECRETS"
value: {{ .Values.vault.secrets | quote}}

#####################
Expand Down
3 changes: 1 addition & 2 deletions charts/tractusx-connector-memory/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
# SPDX-License-Identifier: Apache-2.0
#################################################################################


---
# Default values for eclipse-dataspace-connector.
# This is a YAML-formatted file.
Expand Down Expand Up @@ -289,7 +288,7 @@ runtime:
public: ""
readiness: ""
vault:
# secrets can be seeded by supplying them in a comma separated list key1:secret2,key2:secret2
# secrets can be seeded by supplying them in a semicolon separated list key1:secret2;key2:secret2
secrets: ""
secretNames:
transferProxyTokenEncryptionAesKey: transfer-proxy-token-encryption-aes-key
Expand Down
2 changes: 1 addition & 1 deletion edc-controlplane/edc-runtime-memory/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ extension. When in doubt, check the extensions' README that will likely be in [t

```shell
docker run \
-e SECRETS="key1:secret1,key2:secret2" \
-e EDC_VAULT_SECRETS="key1:secret1;key2:secret2" \
-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 \
Expand Down
3 changes: 1 addition & 2 deletions edc-controlplane/edc-runtime-memory/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,5 @@ COPY ${ADDITIONAL_FILES} ./

HEALTHCHECK NONE

# need the sh -c syntax so that the SECRETS variable gets expanded
# use the "exec" syntax so that SIGINT reaches the JVM -> graceful termination
CMD ["sh", "-c", "exec java -Dedc.fs.config=/app/configuration.properties -Dedc.vault.secrets=\"${SECRETS}\" -Djava.util.logging.config.file=/app/logging.properties -Djava.security.egd=file:/dev/urandom -jar edc-controlplane.jar"]
CMD ["sh", "-c", "exec java -Dedc.fs.config=/app/configuration.properties -Djava.util.logging.config.file=/app/logging.properties -Djava.security.egd=file:/dev/urandom -jar edc-controlplane.jar"]
Loading