[bitnami/postgresql-ha]Fix user configuration for pgpool (#2730)

* Fix user configuration for pgpool

* [bitnami/postgresql-ha] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

* Change value for PGPOOL_USER_CONFIG_FILE when used a configmap, also change instructions in README

* Fix chart version

* [bitnami/postgresql-ha] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

Co-authored-by: rafael <rafael@bitnami.com>
Co-authored-by: Bitnami Containers <containers@bitnami.com>
This commit is contained in:
Rafael Ríos Saavedra
2020-06-02 17:06:52 +02:00
committed by GitHub
parent 332b2a983e
commit df9cabe52f
5 changed files with 15 additions and 11 deletions

View File

@@ -128,6 +128,10 @@ spec:
- name: PGPOOL_MAX_POOL
value: {{ .Values.pgpool.maxPool | quote }}
{{- end }}
{{- if or (.Files.Glob "files/pgpool.conf") .Values.pgpool.configuration .Values.pgpool.configurationCM }}
- name: PGPOOL_USER_CONF_FILE
value: "/opt/bitnami/pgpool/user_config/pgpool.conf"
{{- end }}
{{- if .Values.pgpool.numInitChildren }}
- name: PGPOOL_NUM_INIT_CHILDREN
value: {{ .Values.pgpool.numInitChildren | quote }}
@@ -164,9 +168,9 @@ spec:
resources: {{- toYaml .Values.pgpool.resources | nindent 12 }}
{{- end }}
volumeMounts:
{{- if or (.Files.Glob "files/pgpool.conf") .Values.pgpool.configuration }}
{{- if or (.Files.Glob "files/pgpool.conf") .Values.pgpool.configuration .Values.pgpool.configurationCM }}
- name: pgpool-config
mountPath: /opt/bitnami/pgpool/conf/
mountPath: /opt/bitnami/pgpool/user_config/
{{- end }}
{{- if or (.Files.Glob "files/pgpool-entrypoint-initdb.d/*.sh") .Values.pgpool.initdbScripts .Values.pgpool.initdbScriptsCM }}
- name: custom-init-scripts
@@ -185,7 +189,7 @@ spec:
mountPath: /opt/bitnami/pgpool/secrets/
{{- end }}
volumes:
{{- if or (.Files.Glob "files/pgpool.conf") .Values.pgpool.configuration }}
{{- if or (.Files.Glob "files/pgpool.conf") .Values.pgpool.configuration .Values.pgpool.configurationCM }}
- name: pgpool-config
configMap:
name: {{ include "postgresql-ha.pgpoolConfigurationCM" . }}