Update Kong ingress controller to version 1.4. It fixes the occasional 404 error.

[it/dep.git] / ric-aux / helm / infrastructure / subcharts / kong / charts / postgresql / templates / secrets.yaml

diff --git a/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/secrets.yaml b/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/secrets.yaml
index acc1681..094d18b 100755 (executable)
--- a/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/secrets.yaml
+++ b/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/secrets.yaml
@@ -1,4 +1,4 @@
-{{- if not .Values.existingSecret }}
+{{- if (include "postgresql.createSecret" .) }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -10,16 +10,14 @@ metadata:
     heritage: {{ .Release.Service | quote }}
 type: Opaque
 data:
-  {{- if .Values.postgresqlPassword }}
-  postgresql-password: {{ .Values.postgresqlPassword | b64enc | quote }}
-  {{- else }}
-  postgresql-password: {{ randAlphaNum 10 | b64enc | quote }}
+  {{- if and .Values.postgresqlPostgresPassword (not (eq .Values.postgresqlUsername "postgres")) }}
+  postgresql-postgres-password: {{ include "postgresql.postgres.password" . | b64enc | quote }}
   {{- end }}
+  postgresql-password: {{ include "postgresql.password" . | b64enc | quote }}
   {{- if .Values.replication.enabled }}
-  {{- if .Values.replication.password }}
-  postgresql-replication-password: {{ .Values.replication.password | b64enc | quote }}
-  {{- else }}
-  postgresql-replication-password: {{ randAlphaNum 10 | b64enc | quote }}
+  postgresql-replication-password: {{ include "postgresql.replication.password" . | b64enc | quote }}
   {{- end }}
+  {{- if (and .Values.ldap.enabled .Values.ldap.bind_password)}}
+  postgresql-ldap-password: {{ .Values.ldap.bind_password | b64enc | quote }}
   {{- end }}
 {{- end -}}