Merge pull request #345 from percona/K8SPG-607-patroni

K8SPG-607: Fix patroni.dynamicConfiguration in pg-db

Author: jvpasinatto

charts/pg-db/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: pg-db
 description: 'A Helm chart to deploy the PostgreSQL database with the Percona Operator for PostgreSQL'
 type: application
-version: 2.4.0
+version: 2.4.1
 appVersion: 2.4.0
 home: https://docs.percona.com/percona-operator-for-postgresql/2.0/
 maintainers:

charts/pg-db/README.md

@@ -193,8 +193,11 @@ The chart can be customized using the following configurable parameters:
 | `pmm.resources.requests.cpu`                    | Container resource request for CPU              | `500m`                                                      |
 | `patroni.syncPeriodSeconds` | The interval for refreshing the leader lock and applying dynamicConfiguration | `10` |
 | `patroni.leaderLeaseDurationSeconds` | TTL of the cluster leader lock | `30` |
+| `patroni.dynamicConfiguration` | Custom PostgreSQL configuration options. Please note that configuration changes are automatically applied to the running instances without validation, so having an invalid config can make the cluster unavailable | `{}` |
 | `patroni.dynamicConfiguration.postgresql.parameters`                    | Custom PostgreSQL configuration options              | `{}` |
 | `patroni.dynamicConfiguration.postgresql.pg_hba`                    | PostgreSQL Host-Based Authentication section              | `{}` |
+| `patroni.switchover.enabled` | Enables or disables manual change of the cluster primary instance | `""` |
+| `patroni.switchover.targetInstance` | The name of the Pod that should be set as the new primary. When not specified, the new primary will be selected randomly | `""` |
 | `extensions.image`               | Image for the custom PostgreSQL extension loader sidecar container            | `""` |
 | `extensions.imagePullPolicy`     | Policy for the custom extension sidecar container                             | `Always` |
 | `extensions.storage.type`        | The cloud storage type used for backups. Only s3 type is currently supported. | `""` |

charts/pg-db/templates/cluster.yaml

@@ -500,14 +500,17 @@ spec:
     {{- if .Values.patroni.leaderLeaseDurationSeconds }}
     leaderLeaseDurationSeconds: {{ .Values.patroni.leaderLeaseDurationSeconds }}
     {{- end }}
+    {{- if .Values.patroni.dynamicConfiguration }}
     dynamicConfiguration:
-      postgresql:
-        parameters:
-        {{- .Values.patroni.dynamicConfiguration.postgresql.parameters | toYaml | nindent 10 }}
-        pg_hba:
-        {{- range $pg_hba_entry := .Values.patroni.dynamicConfiguration.postgresql.pg_hba }}
-        - {{ $pg_hba_entry }} 
-        {{- end }}
+{{- .Values.patroni.dynamicConfiguration | toYaml | nindent 6 }}
+    {{- end }}
+    {{- if .Values.patroni.switchover }}
+    switchover:
+      enabled: {{ .Values.patroni.switchover.enabled }}
+      {{- if .Values.patroni.switchover.targetInstance }}
+      targetInstance: {{ .Values.patroni.switchover.targetInstance }}
+      {{- end }}
+    {{- end }}
 {{- end }}
 
 {{- if .Values.extensions }}

charts/pg-db/values.yaml

@@ -476,6 +476,9 @@ pmm:
 #         work_mem: 2MB
 #       pg_hba:
 #       - host    all mytest 123.123.123.123/32 reject
+#   switchover:
+#     enabled: "true"
+#     targetInstance: ""
 
 # extensions:
 #   image: percona/percona-postgresql-operator:2.4.0