diff --git a/charts/db-instances/Chart.yaml b/charts/db-instances/Chart.yaml index 8dfd3a15..a633a3ff 100644 --- a/charts/db-instances/Chart.yaml +++ b/charts/db-instances/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Database Instances for db operator name: db-instances -version: 1.2.0 +version: 1.3.0 diff --git a/charts/db-instances/templates/postgres_exporter.yaml b/charts/db-instances/templates/postgres_exporter.yaml index 93f9569c..e44f1fbb 100644 --- a/charts/db-instances/templates/postgres_exporter.yaml +++ b/charts/db-instances/templates/postgres_exporter.yaml @@ -32,11 +32,11 @@ spec: containers: - env: - name: DATA_SOURCE_URI - value: dbinstance-{{ $name }}-svc:5432/postgres?sslmode=disable + value: {{ $value.monitoring.uri | default (printf "dbinstance-%s-svc:5432/postgres?sslmode=disable" $name) }} - name: DATA_SOURCE_PASS_FILE - value: /run/secrets/db-secrets/password + value: /run/secrets/db-secrets/{{ $value.monitoring.passwordKey | default "password" }} - name: DATA_SOURCE_USER_FILE - value: /run/secrets/db-secrets/user + value: /run/secrets/db-secrets/{{ $value.monitoring.usernameKey | default "user" }} - name: PG_EXPORTER_WEB_LISTEN_ADDRESS value: :60000 - name: PG_EXPORTER_EXTEND_QUERY_PATH