diff --git a/services/health/wger-admin-ensure-cronjob.yaml b/services/health/wger-admin-ensure-cronjob.yaml index cc422e2..03757f6 100644 --- a/services/health/wger-admin-ensure-cronjob.yaml +++ b/services/health/wger-admin-ensure-cronjob.yaml @@ -21,19 +21,19 @@ spec: vault.hashicorp.com/agent-inject-secret-wger-env: "kv/data/atlas/health/wger-db" vault.hashicorp.com/agent-inject-template-wger-env: | {{- with secret "kv/data/atlas/health/wger-db" -}} - export DJANGO_DB_HOST="{{ .Data.data.DJANGO_DB_HOST }}" - export DJANGO_DB_PORT="{{ .Data.data.DJANGO_DB_PORT }}" - export DJANGO_DB_DATABASE="{{ .Data.data.DJANGO_DB_DATABASE }}" - export DJANGO_DB_USER="{{ .Data.data.DJANGO_DB_USER }}" - export DJANGO_DB_PASSWORD="{{ .Data.data.DJANGO_DB_PASSWORD }}" + export DJANGO_DB_HOST='{{ .Data.data.DJANGO_DB_HOST | replace "'" "'\"'\"'" }}' + export DJANGO_DB_PORT='{{ .Data.data.DJANGO_DB_PORT | replace "'" "'\"'\"'" }}' + export DJANGO_DB_DATABASE='{{ .Data.data.DJANGO_DB_DATABASE | replace "'" "'\"'\"'" }}' + export DJANGO_DB_USER='{{ .Data.data.DJANGO_DB_USER | replace "'" "'\"'\"'" }}' + export DJANGO_DB_PASSWORD='{{ .Data.data.DJANGO_DB_PASSWORD | replace "'" "'\"'\"'" }}' {{- end }} {{- with secret "kv/data/atlas/health/wger-secrets" -}} - export SECRET_KEY="{{ .Data.data.SECRET_KEY }}" - export SIGNING_KEY="{{ .Data.data.SIGNING_KEY }}" + export SECRET_KEY='{{ .Data.data.SECRET_KEY | replace "'" "'\"'\"'" }}' + export SIGNING_KEY='{{ .Data.data.SIGNING_KEY | replace "'" "'\"'\"'" }}' {{- end }} {{- with secret "kv/data/atlas/health/wger-admin" -}} - export WGER_ADMIN_USERNAME="{{ .Data.data.username }}" - export WGER_ADMIN_PASSWORD="{{ .Data.data.password }}" + export WGER_ADMIN_USERNAME='{{ .Data.data.username | replace "'" "'\"'\"'" }}' + export WGER_ADMIN_PASSWORD='{{ .Data.data.password | replace "'" "'\"'\"'" }}' {{- end -}} spec: serviceAccountName: health-vault-sync diff --git a/services/health/wger-deployment.yaml b/services/health/wger-deployment.yaml index e39db5b..546a81e 100644 --- a/services/health/wger-deployment.yaml +++ b/services/health/wger-deployment.yaml @@ -20,15 +20,15 @@ spec: vault.hashicorp.com/agent-inject-secret-wger-env: "kv/data/atlas/health/wger-db" vault.hashicorp.com/agent-inject-template-wger-env: | {{- with secret "kv/data/atlas/health/wger-db" -}} - export DJANGO_DB_HOST="{{ .Data.data.DJANGO_DB_HOST }}" - export DJANGO_DB_PORT="{{ .Data.data.DJANGO_DB_PORT }}" - export DJANGO_DB_DATABASE="{{ .Data.data.DJANGO_DB_DATABASE }}" - export DJANGO_DB_USER="{{ .Data.data.DJANGO_DB_USER }}" - export DJANGO_DB_PASSWORD="{{ .Data.data.DJANGO_DB_PASSWORD }}" + export DJANGO_DB_HOST='{{ .Data.data.DJANGO_DB_HOST | replace "'" "'\"'\"'" }}' + export DJANGO_DB_PORT='{{ .Data.data.DJANGO_DB_PORT | replace "'" "'\"'\"'" }}' + export DJANGO_DB_DATABASE='{{ .Data.data.DJANGO_DB_DATABASE | replace "'" "'\"'\"'" }}' + export DJANGO_DB_USER='{{ .Data.data.DJANGO_DB_USER | replace "'" "'\"'\"'" }}' + export DJANGO_DB_PASSWORD='{{ .Data.data.DJANGO_DB_PASSWORD | replace "'" "'\"'\"'" }}' {{- end }} {{- with secret "kv/data/atlas/health/wger-secrets" -}} - export SECRET_KEY="{{ .Data.data.SECRET_KEY }}" - export SIGNING_KEY="{{ .Data.data.SIGNING_KEY }}" + export SECRET_KEY='{{ .Data.data.SECRET_KEY | replace "'" "'\"'\"'" }}' + export SIGNING_KEY='{{ .Data.data.SIGNING_KEY | replace "'" "'\"'\"'" }}' {{- end -}} spec: affinity: diff --git a/services/health/wger-user-sync-cronjob.yaml b/services/health/wger-user-sync-cronjob.yaml index 5e23852..2ac85ea 100644 --- a/services/health/wger-user-sync-cronjob.yaml +++ b/services/health/wger-user-sync-cronjob.yaml @@ -22,15 +22,15 @@ spec: vault.hashicorp.com/agent-inject-secret-wger-env: "kv/data/atlas/health/wger-db" vault.hashicorp.com/agent-inject-template-wger-env: | {{- with secret "kv/data/atlas/health/wger-db" -}} - export DJANGO_DB_HOST="{{ .Data.data.DJANGO_DB_HOST }}" - export DJANGO_DB_PORT="{{ .Data.data.DJANGO_DB_PORT }}" - export DJANGO_DB_DATABASE="{{ .Data.data.DJANGO_DB_DATABASE }}" - export DJANGO_DB_USER="{{ .Data.data.DJANGO_DB_USER }}" - export DJANGO_DB_PASSWORD="{{ .Data.data.DJANGO_DB_PASSWORD }}" + export DJANGO_DB_HOST='{{ .Data.data.DJANGO_DB_HOST | replace "'" "'\"'\"'" }}' + export DJANGO_DB_PORT='{{ .Data.data.DJANGO_DB_PORT | replace "'" "'\"'\"'" }}' + export DJANGO_DB_DATABASE='{{ .Data.data.DJANGO_DB_DATABASE | replace "'" "'\"'\"'" }}' + export DJANGO_DB_USER='{{ .Data.data.DJANGO_DB_USER | replace "'" "'\"'\"'" }}' + export DJANGO_DB_PASSWORD='{{ .Data.data.DJANGO_DB_PASSWORD | replace "'" "'\"'\"'" }}' {{- end }} {{- with secret "kv/data/atlas/health/wger-secrets" -}} - export SECRET_KEY="{{ .Data.data.SECRET_KEY }}" - export SIGNING_KEY="{{ .Data.data.SIGNING_KEY }}" + export SECRET_KEY='{{ .Data.data.SECRET_KEY | replace "'" "'\"'\"'" }}' + export SIGNING_KEY='{{ .Data.data.SIGNING_KEY | replace "'" "'\"'\"'" }}' {{- end -}} spec: serviceAccountName: health-vault-sync