fix annotations
This commit is contained in:
parent
707f5c138f
commit
fe4b0aca28
@ -21,10 +21,10 @@ spec:
|
||||
retries: 3
|
||||
|
||||
upgrade:
|
||||
force: true
|
||||
timeout: 2h
|
||||
remediation:
|
||||
retries: 3
|
||||
strategy: uninstall
|
||||
|
||||
values:
|
||||
global:
|
||||
@ -103,7 +103,7 @@ spec:
|
||||
contour:
|
||||
enabled: true
|
||||
adminUser: "postgres"
|
||||
sharedPreloadLibraries: "pg_stat_statements,uuid-ossp,ltree,pg_partman"
|
||||
sharedPreloadLibraries: "pg_stat_statements,uuid-ossp,ltree"
|
||||
vault:
|
||||
enabled: true
|
||||
role: postgresql
|
||||
@ -120,7 +120,6 @@ spec:
|
||||
- ltree
|
||||
- timescaledb
|
||||
- uuid-ossp
|
||||
- pg_partman
|
||||
restoreFromDump: false
|
||||
s3-proxy:
|
||||
endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local"
|
||||
|
||||
@ -50,14 +50,15 @@ spec:
|
||||
{{- with secret "secrets/data/minio/apps/django" -}}
|
||||
AWS_S3_ENDPOINT_URL=https://minio.contour.infra.sarex.tech
|
||||
S3_HOST=https://minio.contour.infra.sarex.tech
|
||||
S3_BUCKET=rfi
|
||||
{{- $buckets := index .Data.data "buckets" -}}
|
||||
S3_BUCKET={{- if gt (len $buckets) 0 -}}{{ index (index $buckets 0) "name" }}{{- else -}}django{{- end -}}
|
||||
S3_LOGIN={{ index .Data.data "access_key" }}
|
||||
S3_PASSWORD={{ index .Data.data "secret_key" }}
|
||||
{{- end -}}
|
||||
vault.hashicorp.com/agent-inject-secret-django-kafka: secrets/data/kafka/apps/django
|
||||
vault.hashicorp.com/agent-inject-template-django-kafka: |-
|
||||
{{- with secret "secrets/data/kafka/apps/django" -}}
|
||||
KAFKA_BOOTSTRAP_SERVERS=["{{ index .Data.data.auth "bootstrap_servers" }}"]
|
||||
KAFKA_BOOTSTRAP_SERVERS="[\"{{ index .Data.data.auth "bootstrap_servers" }}\"]"
|
||||
KAFKA_SECURITY_PROTOCOL={{ index .Data.data.auth "security_protocol" }}
|
||||
KAFKA_SASL_MECHANISM={{ index .Data.data.auth "sasl_mechanism" }}
|
||||
KAFKA_SASL_PLAIN_USERNAME={{ index .Data.data "username" }}
|
||||
|
||||
@ -50,14 +50,15 @@ spec:
|
||||
{{- with secret "secrets/data/minio/apps/django" -}}
|
||||
AWS_S3_ENDPOINT_URL=https://minio.contour.infra.sarex.tech
|
||||
S3_HOST=https://minio.contour.infra.sarex.tech
|
||||
S3_BUCKET=rfi
|
||||
{{- $buckets := index .Data.data "buckets" -}}
|
||||
S3_BUCKET={{- if gt (len $buckets) 0 -}}{{ index (index $buckets 0) "name" }}{{- else -}}django{{- end -}}
|
||||
S3_LOGIN={{ index .Data.data "access_key" }}
|
||||
S3_PASSWORD={{ index .Data.data "secret_key" }}
|
||||
{{- end -}}
|
||||
vault.hashicorp.com/agent-inject-secret-django-kafka: secrets/data/kafka/apps/django
|
||||
vault.hashicorp.com/agent-inject-template-django-kafka: |-
|
||||
{{- with secret "secrets/data/kafka/apps/django" -}}
|
||||
KAFKA_BOOTSTRAP_SERVERS=["{{ index .Data.data.auth "bootstrap_servers" }}"]
|
||||
KAFKA_BOOTSTRAP_SERVERS="[\"{{ index .Data.data.auth "bootstrap_servers" }}\"]"
|
||||
KAFKA_SECURITY_PROTOCOL={{ index .Data.data.auth "security_protocol" }}
|
||||
KAFKA_SASL_MECHANISM={{ index .Data.data.auth "sasl_mechanism" }}
|
||||
KAFKA_SASL_PLAIN_USERNAME={{ index .Data.data "username" }}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user