++
This commit is contained in:
parent
a8624abfc1
commit
45df0ed4d5
@ -48,6 +48,7 @@ spec:
|
||||
set -a
|
||||
[ -f /vault/secrets/documentations-postgresql ] && . /vault/secrets/documentations-postgresql
|
||||
[ -f /vault/secrets/documentations-common ] && . /vault/secrets/documentations-common
|
||||
[ -f /vault/secrets/documentations-marks-rabbitmq ] && . /vault/secrets/documentations-marks-rabbitmq
|
||||
[ -f /vault/secrets/documentations-rsa-public ] && export PUBLIC_KEY="$(cat /vault/secrets/documentations-rsa-public)"
|
||||
set +a
|
||||
exec /app/entrypoint.sh
|
||||
@ -169,6 +170,15 @@ spec:
|
||||
- name: MARKS_PROCESSING_URL
|
||||
value:
|
||||
_default: http://marks-service:8000
|
||||
- name: USE_MARKS_RABBITMQ
|
||||
value:
|
||||
_default: "true"
|
||||
- name: MARKS_RABBITMQ_HOST
|
||||
value:
|
||||
_default: rabbitmq.rabbitmq.svc.cluster.local
|
||||
- name: MARKS_RABBITMQ_PORT
|
||||
value:
|
||||
_default: "5672"
|
||||
- name: PUBLIC_LINK_HOST
|
||||
value:
|
||||
_default: https://document-link-srx.wb.ru
|
||||
@ -261,3 +271,10 @@ spec:
|
||||
{{- with secret "secrets/data/vault/common/rsa_keys" -}}
|
||||
{{ index .Data.data "public_key" }}
|
||||
{{- end -}}
|
||||
vault.hashicorp.com/agent-inject-secret-documentations-marks-rabbitmq: secrets/data/rabbitmq/apps/cde
|
||||
vault.hashicorp.com/agent-inject-template-documentations-marks-rabbitmq: |-
|
||||
{{- with secret "secrets/data/rabbitmq/apps/cde" -}}
|
||||
MARKS_RABBITMQ_USER={{ index .Data.data "username" }}
|
||||
MARKS_RABBITMQ_PASSWORD={{ index .Data.data "password" }}
|
||||
MARKS_RABBITMQ_API={{ index .Data.data "vhost" }}
|
||||
{{- end -}}
|
||||
|
||||
@ -92,6 +92,14 @@ spec:
|
||||
value:
|
||||
_default: "4"
|
||||
|
||||
- name: HASHER_AMQP__HOST
|
||||
value:
|
||||
_default: rabbitmq.rabbitmq.svc.cluster.local
|
||||
|
||||
- name: HASHER_AMQP__PORT
|
||||
value:
|
||||
_default: "5672"
|
||||
|
||||
- name: HASHER_AMQP__ROUTING__TASK_INPUT_QUEUE
|
||||
value:
|
||||
_default: hash.compute.normal.tasks
|
||||
@ -140,19 +148,17 @@ spec:
|
||||
vault.hashicorp.com/agent-pre-populate-only: "true"
|
||||
vault.hashicorp.com/auth-path: auth/kubernetes
|
||||
vault.hashicorp.com/role: documentations
|
||||
vault.hashicorp.com/agent-inject-secret-documentations-hasher-rabbitmq: secrets/data/apps/documentations/hasher/rabbitmq
|
||||
vault.hashicorp.com/agent-inject-secret-documentations-hasher-rabbitmq: secrets/data/rabbitmq/apps/cde
|
||||
vault.hashicorp.com/agent-inject-template-documentations-hasher-rabbitmq: |-
|
||||
{{- with secret "secrets/data/apps/documentations/hasher/rabbitmq" -}}
|
||||
HASHER_AMQP__HOST={{ index .Data.data "host" }}
|
||||
HASHER_AMQP__PORT={{ index .Data.data "port" }}
|
||||
{{- with secret "secrets/data/rabbitmq/apps/cde" -}}
|
||||
HASHER_AMQP__USERNAME={{ index .Data.data "username" }}
|
||||
HASHER_AMQP__PASSWORD={{ index .Data.data "password" }}
|
||||
HASHER_AMQP__VHOST={{ index .Data.data "vhost" }}
|
||||
{{- end -}}
|
||||
vault.hashicorp.com/agent-inject-secret-documentations-hasher-s3: secrets/data/apps/documentations/hasher/s3
|
||||
vault.hashicorp.com/agent-inject-secret-documentations-hasher-s3: secrets/data/minio/apps/documentations
|
||||
vault.hashicorp.com/agent-inject-template-documentations-hasher-s3: |-
|
||||
{{- with secret "secrets/data/apps/documentations/hasher/s3" -}}
|
||||
HASHER_S3__ENDPOINT={{ index .Data.data "endpoint" }}
|
||||
{{- with secret "secrets/data/minio/apps/documentations" -}}
|
||||
HASHER_S3__ENDPOINT={{ index .Data.data.client "endpoint" }}
|
||||
HASHER_S3__ACCESS_KEY={{ index .Data.data "access_key" }}
|
||||
HASHER_S3__SECRET_KEY={{ index .Data.data "secret_key" }}
|
||||
{{- end -}}
|
||||
|
||||
@ -151,17 +151,17 @@ spec:
|
||||
MARKS_DOCUMENTS_DB__PASSWORD={{ index .Data.data "password" }}
|
||||
MARKS_DOCUMENTS_DB__SSLMODE=disable
|
||||
{{- end -}}
|
||||
vault.hashicorp.com/agent-inject-secret-documentations-marks-rabbitmq: secrets/data/rabbitmq/apps/documentations
|
||||
vault.hashicorp.com/agent-inject-secret-documentations-marks-rabbitmq: secrets/data/rabbitmq/apps/cde
|
||||
vault.hashicorp.com/agent-inject-template-documentations-marks-rabbitmq: |-
|
||||
{{- with secret "secrets/data/rabbitmq/apps/documentations" -}}
|
||||
{{- with secret "secrets/data/rabbitmq/apps/cde" -}}
|
||||
MARKS_RABBITMQ__USERNAME={{ index .Data.data "username" }}
|
||||
MARKS_RABBITMQ__PASSWORD={{ index .Data.data "password" }}
|
||||
MARKS_RABBITMQ__VHOST={{ index .Data.data "vhost" }}
|
||||
{{- end -}}
|
||||
vault.hashicorp.com/agent-inject-secret-documentations-marks-s3: secrets/data/apps/documentations/marks-s3
|
||||
vault.hashicorp.com/agent-inject-secret-documentations-marks-s3: secrets/data/minio/apps/documentations
|
||||
vault.hashicorp.com/agent-inject-template-documentations-marks-s3: |-
|
||||
{{- with secret "secrets/data/apps/documentations/marks-s3" -}}
|
||||
MARKS_S3__URL={{ index .Data.data "endpoint_url" }}
|
||||
{{- with secret "secrets/data/minio/apps/documentations" -}}
|
||||
MARKS_S3__URL={{ index .Data.data.client "endpoint" }}
|
||||
MARKS_S3__ACCESS_KEY={{ index .Data.data "access_key" }}
|
||||
MARKS_S3__SECRET_KEY={{ index .Data.data "secret_key" }}
|
||||
{{- end -}}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user