veles: build database url from split secrets
This commit is contained in:
parent
bcb8c07362
commit
909e8f376c
@ -24,9 +24,13 @@ spec:
|
|||||||
vault.hashicorp.com/agent-inject-secret-veles-env.sh: "kv/data/atlas/veles/veles-db"
|
vault.hashicorp.com/agent-inject-secret-veles-env.sh: "kv/data/atlas/veles/veles-db"
|
||||||
vault.hashicorp.com/agent-inject-template-veles-env.sh: |
|
vault.hashicorp.com/agent-inject-template-veles-env.sh: |
|
||||||
{{- with secret "kv/data/atlas/veles/veles-db" }}
|
{{- with secret "kv/data/atlas/veles/veles-db" }}
|
||||||
export DATABASE_URL="{{ .Data.data.DATABASE_URL }}"
|
unset DATABASE_URL
|
||||||
|
export VELES_DATABASE_HOST="{{ .Data.data.POSTGRES_HOST }}"
|
||||||
|
export VELES_DATABASE_PORT="{{ .Data.data.POSTGRES_PORT }}"
|
||||||
|
export VELES_DATABASE_NAME="{{ .Data.data.POSTGRES_DB }}"
|
||||||
export VELES_DATABASE_USER="{{ .Data.data.POSTGRES_USER }}"
|
export VELES_DATABASE_USER="{{ .Data.data.POSTGRES_USER }}"
|
||||||
export VELES_DATABASE_PASSWORD="{{ .Data.data.POSTGRES_PASSWORD }}"
|
export VELES_DATABASE_PASSWORD="{{ .Data.data.POSTGRES_PASSWORD }}"
|
||||||
|
export VELES_DATABASE_SSLMODE="disable"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- with secret "kv/data/atlas/veles/veles-oidc" }}
|
{{- with secret "kv/data/atlas/veles/veles-oidc" }}
|
||||||
export VELES_OIDC_CLIENT_SECRET="{{ .Data.data.client_secret }}"
|
export VELES_OIDC_CLIENT_SECRET="{{ .Data.data.client_secret }}"
|
||||||
|
|||||||
@ -96,7 +96,7 @@ spec:
|
|||||||
--arg db "veles" \
|
--arg db "veles" \
|
||||||
--arg user "veles" \
|
--arg user "veles" \
|
||||||
--arg password "${db_password}" \
|
--arg password "${db_password}" \
|
||||||
'{data:{POSTGRES_HOST:$host,POSTGRES_PORT:$port,POSTGRES_DB:$db,POSTGRES_USER:$user,POSTGRES_PASSWORD:$password,DATABASE_URL:("postgresql://"+$user+":"+$password+"@"+$host+":"+$port+"/"+$db+"?sslmode=disable")}}')"
|
'{data:{POSTGRES_HOST:$host,POSTGRES_PORT:$port,POSTGRES_DB:$db,POSTGRES_USER:$user,POSTGRES_PASSWORD:$password,DATABASE_URL:("postgresql://"+($user|@uri)+":"+($password|@uri)+"@"+$host+":"+$port+"/"+($db|@uri)+"?sslmode=disable")}}')"
|
||||||
write_secret veles/veles-db "${db_payload}"
|
write_secret veles/veles-db "${db_payload}"
|
||||||
|
|
||||||
status="$(read_secret veles/app-secrets /tmp/app-secrets.json)"
|
status="$(read_secret veles/app-secrets /tmp/app-secrets.json)"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user