merge with master

manifests/complete-postgres-manifest.yaml

@@ -19,6 +19,7 @@ spec:
     - createdb
   enableMasterLoadBalancer: false
   enableReplicaLoadBalancer: false
+#  enableConnectionPooler: true  # not needed when connectionPooler section is present (see below)
   allowedSourceRanges:  # load balancers' source ranges for both master and replica services
   - 127.0.0.1/32
   databases:
@@ -96,6 +97,19 @@ spec:
 #  - 01:00-06:00  #UTC
 #  - Sat:00:00-04:00
 
+  connectionPooler:
+    numberOfInstances: 2
+    mode: "transaction"
+    schema: "pooler"
+    user: "pooler"
+    resources:
+      requests:
+        cpu: 300m
+        memory: 100Mi
+      limits:
+        cpu: "1"
+        memory: 100Mi
+
   initContainers:
   - name: date
     image: busybox
@@ -120,3 +134,5 @@ spec:
     certificateFile: "tls.crt"
     privateKeyFile: "tls.key"
     caFile: ""  # optionally configure Postgres with a CA certificate
+# When TLS is enabled, also set spiloFSGroup parameter above to the relevant value.
+# if unknown, set it to 103 which is the usual value in the default spilo images.

manifests/configmap.yaml

@@ -11,16 +11,16 @@ data:
   cluster_history_entries: "1000"
   cluster_labels: application:spilo
   cluster_name_label: cluster-name
-  # connection_pool_default_cpu_limit: "1"
-  # connection_pool_default_cpu_request: "500m"
-  # connection_pool_default_memory_limit: 100Mi
-  # connection_pool_default_memory_request: 100Mi
-  connection_pool_image: "registry.opensource.zalan.do/acid/pgbouncer:master-5"
-  # connection_pool_max_db_connections: 60
-  # connection_pool_mode: "transaction"
-  # connection_pool_number_of_instances: 2
-  # connection_pool_schema: "pooler"
-  # connection_pool_user: "pooler"
+  # connection_pooler_default_cpu_limit: "1"
+  # connection_pooler_default_cpu_request: "500m"
+  # connection_pooler_default_memory_limit: 100Mi
+  # connection_pooler_default_memory_request: 100Mi
+  connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-5"
+  # connection_pooler_max_db_connections: 60
+  # connection_pooler_mode: "transaction"
+  # connection_pooler_number_of_instances: 2
+  # connection_pooler_schema: "pooler"
+  # connection_pooler_user: "pooler"
   # custom_service_annotations: "keyx:valuez,keya:valuea"
   # custom_pod_annotations: "keya:valuea,keyb:valueb"
   db_hosted_zone: db.example.com
@@ -43,6 +43,7 @@ data:
   # enable_team_superuser: "false"
   enable_teams_api: "false"
   # etcd_host: ""
+  # kubernetes_use_configmaps: "false"
   # infrastructure_roles_secret_name: postgresql-infrastructure-roles
   # inherited_labels: application,environment
   # kube_iam_role: ""

manifests/operatorconfiguration.crd.yaml

@@ -42,6 +42,8 @@ spec:
               type: boolean
             etcd_host:
               type: string
+            kubernetes_use_configmaps:
+              type: boolean
             max_instances:
               type: integer
               minimum: -1  # -1 = disabled
@@ -294,44 +296,44 @@ spec:
                   pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
                 scalyr_server_url:
                   type: string
-            connection_pool:
+            connection_pooler:
               type: object
               properties:
-                connection_pool_schema:
+                connection_pooler_schema:
                   type: string
                   #default: "pooler"
-                connection_pool_user:
+                connection_pooler_user:
                   type: string
                   #default: "pooler"
-                connection_pool_image:
+                connection_pooler_image:
                   type: string
                   #default: "registry.opensource.zalan.do/acid/pgbouncer"
-                connection_pool_max_db_connections:
+                connection_pooler_max_db_connections:
                   type: integer
                   #default: 60
-                connection_pool_mode:
+                connection_pooler_mode:
                   type: string
                   enum:
                     - "session"
                     - "transaction"
                   #default: "transaction"
-                connection_pool_number_of_instances:
+                connection_pooler_number_of_instances:
                   type: integer
                   minimum: 2
                   #default: 2
-                connection_pool_default_cpu_limit:
+                connection_pooler_default_cpu_limit:
                   type: string
                   pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
                   #default: "1"
-                connection_pool_default_cpu_request:
+                connection_pooler_default_cpu_request:
                   type: string
                   pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
                   #default: "500m"
-                connection_pool_default_memory_limit:
+                connection_pooler_default_memory_limit:
                   type: string
                   pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
                   #default: "100Mi"
-                connection_pool_default_memory_request:
+                connection_pooler_default_memory_request:
                   type: string
                   pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
                   #default: "100Mi"

manifests/postgresql-operator-default-configuration.yaml

@@ -5,6 +5,7 @@ metadata:
 configuration:
   # enable_crd_validation: true
   etcd_host: ""
+  # kubernetes_use_configmaps: false
   docker_image: registry.opensource.zalan.do/acid/spilo-12:1.6-p2
   # enable_shm_volume: true
   max_instances: -1
@@ -121,14 +122,14 @@ configuration:
     scalyr_memory_limit: 500Mi
     scalyr_memory_request: 50Mi
     # scalyr_server_url: ""
-  connection_pool:
-    connection_pool_default_cpu_limit: "1"
-    connection_pool_default_cpu_request: "500m"
-    connection_pool_default_memory_limit: 100Mi
-    connection_pool_default_memory_request: 100Mi
-    connection_pool_image: "registry.opensource.zalan.do/acid/pgbouncer:master-5"
-    # connection_pool_max_db_connections: 60
-    connection_pool_mode: "transaction"
-    connection_pool_number_of_instances: 2
-    # connection_pool_schema: "pooler"
-    # connection_pool_user: "pooler"
+  connection_pooler:
+    connection_pooler_default_cpu_limit: "1"
+    connection_pooler_default_cpu_request: "500m"
+    connection_pooler_default_memory_limit: 100Mi
+    connection_pooler_default_memory_request: 100Mi
+    connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-5"
+    # connection_pooler_max_db_connections: 60
+    connection_pooler_mode: "transaction"
+    connection_pooler_number_of_instances: 2
+    # connection_pooler_schema: "pooler"
+    # connection_pooler_user: "pooler"

manifests/postgresql.crd.yaml

@@ -70,7 +70,7 @@ spec:
                 uid:
                   format: uuid
                   type: string
-            connectionPool:
+            connectionPooler:
               type: object
               properties:
                 dockerImage:
@@ -126,7 +126,7 @@ spec:
               # Note: usernames specified here as database owners must be declared in the users key of the spec key.
             dockerImage:
               type: string
-            enableConnectionPool:
+            enableConnectionPooler:
               type: boolean
             enableLogicalBackup:
               type: boolean