reflect new pooler parameter in validation + define same pooler image everywhere

This commit is contained in:
Felix Kunde
2020-03-04 10:38:01 +01:00
parent 2bba673f1d
commit 4d12615c0d
8 changed files with 35 additions and 32 deletions
+1 -1
View File
@@ -15,7 +15,7 @@ data:
# connection_pool_default_cpu_request: "1"
# connection_pool_default_memory_limit: 100m
# connection_pool_default_memory_request: "100Mi"
connection_pool_image: "registry.opensource.zalan.do/acid/pgbouncer:master-3"
connection_pool_image: "registry.opensource.zalan.do/acid/pgbouncer:master-5"
# connection_pool_number_of_instances: 1
# connection_pool_mode: "transaction"
# connection_pool_schema: "pooler"
+7 -4
View File
@@ -303,18 +303,21 @@ spec:
connection_pool_user:
type: string
#default: "pooler"
connection_pool_number_of_instances:
type: integer
#default: 1
connection_pool_image:
type: string
#default: "registry.opensource.zalan.do/acid/pgbouncer:1.0.0"
#default: "registry.opensource.zalan.do/acid/pgbouncer:master-5"
connection_pool_max_db_connections:
type: integer
#default: 60
connection_pool_mode:
type: string
enum:
- "session"
- "transaction"
#default: "transaction"
connection_pool_number_of_instances:
type: integer
#default: 1
connection_pool_default_cpu_limit:
type: string
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
@@ -126,7 +126,7 @@ configuration:
connection_pool_default_cpu_request: "1"
connection_pool_default_memory_limit: 100m
connection_pool_default_memory_request: "100Mi"
connection_pool_image: "registry.opensource.zalan.do/acid/pgbouncer:master-3"
connection_pool_image: "registry.opensource.zalan.do/acid/pgbouncer:master-5"
connection_pool_number_of_instances: 1
connection_pool_mode: "transaction"
# connection_pool_schema: "pooler"
+2
View File
@@ -75,6 +75,8 @@ spec:
properties:
dockerImage:
type: string
maxDBConnections:
type: integer
mode:
type: string
enum: