public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update pooler default image and add explanation for maxDBConnections param

This commit is contained in:
Felix Kunde 2020-03-20 15:56:27 +01:00
parent bdb3eaf9c2
commit b0f534776d
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/postgres-operator/crds/operatorconfigurations.yaml
View File

@ -329,7 +329,7 @@ spec:
#default: "pooler" #default: "pooler"
connection_pool_image: connection_pool_image:
type: string type: string
#default: "registry.opensource.zalan.do/acid/pgbouncer:master-5" #default: "registry.opensource.zalan.do/acid/pgbouncer"
connection_pool_max_db_connections: connection_pool_max_db_connections:
type: integer type: integer
#default: 60 #default: 60

3
docs/reference/cluster_manifest.md
View File

@ -385,7 +385,8 @@ present.
Which docker image to use for connection pool deployment. Which docker image to use for connection pool deployment.
* **maxDBConnections** * **maxDBConnections**
How many connections the pooler can max hold. How many connections the pooler can max hold. This value is divided by the
number of pooler pods.
* **mode** * **mode**
In which mode to run connection pool, transaction or session. In which mode to run connection pool, transaction or session.

6
docs/reference/operator_parameters.md
View File

@ -616,10 +616,12 @@ operator being able to provide some reasonable defaults.
* **connection_pool_image** * **connection_pool_image**
Docker image to use for connection pool deployment. Docker image to use for connection pool deployment.
Default: "registry.opensource.zalan.do/acid/pgbouncer:master-5" Default: "registry.opensource.zalan.do/acid/pgbouncer"
* **connection_pool_max_db_connections** * **connection_pool_max_db_connections**
How many connections the pooler can max hold. Default is 60. How many connections the pooler can max hold. This value is divided by the
number of pooler pods. Default is 60 which will make up 30 connections per
pod for the default setup with two instances.
* **connection_pool_mode** * **connection_pool_mode**
Default pool mode, `session` or `transaction`. Default is `transaction`. Default pool mode, `session` or `transaction`. Default is `transaction`.

2
manifests/operatorconfiguration.crd.yaml
View File

@ -305,7 +305,7 @@ spec:
#default: "pooler" #default: "pooler"
connection_pool_image: connection_pool_image:
type: string type: string
#default: "registry.opensource.zalan.do/acid/pgbouncer:master-5" #default: "registry.opensource.zalan.do/acid/pgbouncer"
connection_pool_max_db_connections: connection_pool_max_db_connections:
type: integer type: integer
#default: 60 #default: 60

2
pkg/controller/operator_config.go
View File

@ -168,7 +168,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
result.ConnectionPool.Image = util.Coalesce( result.ConnectionPool.Image = util.Coalesce(
fromCRD.ConnectionPool.Image, fromCRD.ConnectionPool.Image,
"registry.opensource.zalan.do/acid/pgbouncer:master-5") "registry.opensource.zalan.do/acid/pgbouncer")
result.ConnectionPool.Mode = util.Coalesce( result.ConnectionPool.Mode = util.Coalesce(
fromCRD.ConnectionPool.Mode, fromCRD.ConnectionPool.Mode,

2
pkg/util/config/config.go
View File

@ -89,7 +89,7 @@ type ConnectionPool struct {
NumberOfInstances *int32 `name:"connection_pool_number_of_instances" default:"2"` NumberOfInstances *int32 `name:"connection_pool_number_of_instances" default:"2"`
Schema string `name:"connection_pool_schema" default:"pooler"` Schema string `name:"connection_pool_schema" default:"pooler"`
User string `name:"connection_pool_user" default:"pooler"` User string `name:"connection_pool_user" default:"pooler"`
Image string `name:"connection_pool_image" default:"registry.opensource.zalan.do/acid/pgbouncer:master-5"` Image string `name:"connection_pool_image" default:"registry.opensource.zalan.do/acid/pgbouncer"`
Mode string `name:"connection_pool_mode" default:"transaction"` Mode string `name:"connection_pool_mode" default:"transaction"`
MaxDBConnections *int32 `name:"connection_pool_max_db_connections" default:"60"` MaxDBConnections *int32 `name:"connection_pool_max_db_connections" default:"60"`
ConnPoolDefaultCPURequest string `name:"connection_pool_default_cpu_request" default:"1"` ConnPoolDefaultCPURequest string `name:"connection_pool_default_cpu_request" default:"1"`