From bebe071c9d969ac35e7a1019e061cf4c714ec002 Mon Sep 17 00:00:00 2001 From: Yannic Remmet-Zarotiadis Date: Tue, 1 Oct 2024 08:14:16 +0200 Subject: [PATCH] fixing ldap configuration Signed-off-by: Yannic Remmet-Zarotiadis --- charts/cluster/README.md | 2 +- charts/cluster/templates/cluster.yaml | 2 ++ charts/cluster/values.schema.json | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/cluster/README.md b/charts/cluster/README.md index f6d3853db..9e16517e5 100644 --- a/charts/cluster/README.md +++ b/charts/cluster/README.md @@ -170,7 +170,7 @@ refer to the [CloudNativePG Documentation](https://cloudnative-pg.io/documentat | cluster.postgresql.parameters | object | `{}` | PostgreSQL configuration options (postgresql.conf) | | cluster.postgresql.pg_hba | list | `[]` | PostgreSQL Host Based Authentication rules (lines to be appended to the pg_hba.conf file) | | cluster.postgresql.pg_ident | list | `[]` | PostgreSQL User Name Maps rules (lines to be appended to the pg_ident.conf file) | -| cluster.postgresql.ldap | list | `[]` | PostgreSQL LDAP configuration (lines to be appended to the pg_hba.conf file) (see https://cloudnative-pg.io/documentation/current/postgresql_conf/#ldap-configuration) | +| cluster.postgresql.ldap | list | `[]` | PostgreSQL LDAP configuration (see https://cloudnative-pg.io/documentation/current/postgresql_conf/#ldap-configuration) | | cluster.postgresql.shared_preload_libraries | list | `[]` | Lists of shared preload libraries to add to the default ones | | cluster.primaryUpdateMethod | string | `"switchover"` | Method to follow to upgrade the primary server during a rolling update procedure, after all replicas have been successfully updated. It can be switchover (default) or restart. | | cluster.primaryUpdateStrategy | string | `"unsupervised"` | Strategy to follow to upgrade the primary server during a rolling update procedure, after all replicas have been successfully updated: it can be automated (unsupervised - default) or manual (supervised) | diff --git a/charts/cluster/templates/cluster.yaml b/charts/cluster/templates/cluster.yaml index 09da326f2..c80454134 100644 --- a/charts/cluster/templates/cluster.yaml +++ b/charts/cluster/templates/cluster.yaml @@ -66,8 +66,10 @@ spec: {{- toYaml .pg_hba | nindent 6 }} pg_ident: {{- toYaml .pg_ident | nindent 6 }} + {{- if .ldap }} ldap: {{- toYaml .ldap | nindent 6 }} + {{- end}} {{ end }} managed: diff --git a/charts/cluster/values.schema.json b/charts/cluster/values.schema.json index 3a848df92..177ab9953 100644 --- a/charts/cluster/values.schema.json +++ b/charts/cluster/values.schema.json @@ -260,7 +260,7 @@ "type": "array" }, "ldap": { - "type": "array" + "type": "object" } } },