Merge branch 'master' into delete-volume-on-scale-down

charts/postgres-operator/crds/operatorconfigurations.yaml

@@ -68,6 +68,8 @@ spec:
               type: boolean
             etcd_host:
               type: string
+            kubernetes_use_configmaps:
+              type: boolean
             max_instances:
               type: integer
               minimum: -1  # -1 = disabled

charts/postgres-operator/crds/postgresqls.yaml

@@ -218,6 +218,10 @@ spec:
                   type: integer
                 retry_timeout:
                   type: integer
+                synchronous_mode:
+                  type: boolean
+                synchronous_mode_strict:
+                  type: boolean
                 maximum_lag_on_failover:
                   type: integer
             podAnnotations:

charts/postgres-operator/values-crd.yaml

@@ -25,6 +25,8 @@ configGeneral:
   enable_unused_pvc_deletion: false
   # etcd connection string for Patroni. Empty uses K8s-native DCS.
   etcd_host: ""
+  # Select if setup uses endpoints (default), or configmaps to manage leader (DCS=k8s)
+  # kubernetes_use_configmaps: false
   # Spilo docker image
   docker_image: registry.opensource.zalan.do/acid/spilo-12:1.6-p2
   # max number of instances in Postgres cluster. -1 = no limit

charts/postgres-operator/values.yaml

@@ -25,6 +25,8 @@ configGeneral:
   enable_unused_pvc_deletion: "false"
   # etcd connection string for Patroni. Empty uses K8s-native DCS.
   etcd_host: ""
+  # Select if setup uses endpoints (default), or configmaps to manage leader (DCS=k8s)
+  # kubernetes_use_configmaps: "false"
   # Spilo docker image
   docker_image: registry.opensource.zalan.do/acid/spilo-12:1.6-p2
   # max number of instances in Postgres cluster. -1 = no limit