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

lower CPU request and update docs

This commit is contained in:
Felix Kunde 2020-03-20 17:26:33 +01:00
parent b0f534776d
commit 21af41025a
11 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -350,7 +350,7 @@ spec:
connection_pool_default_cpu_request: connection_pool_default_cpu_request:
type: string type: string
pattern: '^(\d+m|\d+(\.\d{1,3})?)$' pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
#default: "1" #default: "500m"
connection_pool_default_memory_limit: connection_pool_default_memory_limit:
type: string type: string
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$' pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'

2
charts/postgres-operator/values-crd.yaml
View File

@ -283,7 +283,7 @@ configConnectionPool:
# number of pooler instances # number of pooler instances
connection_pool_number_of_instances: 2 connection_pool_number_of_instances: 2
# default resources # default resources
connection_pool_default_cpu_request: "1" connection_pool_default_cpu_request: 500m
connection_pool_default_memory_request: 100Mi connection_pool_default_memory_request: 100Mi
connection_pool_default_cpu_limit: "1" connection_pool_default_cpu_limit: "1"
connection_pool_default_memory_limit: 100Mi connection_pool_default_memory_limit: 100Mi

2
charts/postgres-operator/values.yaml
View File

@ -260,7 +260,7 @@ configConnectionPool:
# number of pooler instances # number of pooler instances
connection_pool_number_of_instances: 2 connection_pool_number_of_instances: 2
# default resources # default resources
connection_pool_default_cpu_request: "1" connection_pool_default_cpu_request: 500m
connection_pool_default_memory_request: 100Mi connection_pool_default_memory_request: 100Mi
connection_pool_default_cpu_limit: "1" connection_pool_default_cpu_limit: "1"
connection_pool_default_memory_limit: 100Mi connection_pool_default_memory_limit: 100Mi

4
docs/reference/cluster_manifest.md
View File

@ -385,8 +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. This value is divided by the How many connections the pooler can max hold. This value is divided among the
number of pooler pods. pooler pods.
* **mode** * **mode**
In which mode to run connection pool, transaction or session. In which mode to run connection pool, transaction or session.

8
docs/reference/operator_parameters.md
View File

@ -619,9 +619,9 @@ operator being able to provide some reasonable defaults.
Default: "registry.opensource.zalan.do/acid/pgbouncer" 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. This value is divided by the How many connections the pooler can max hold. This value is divided among the
number of pooler pods. Default is 60 which will make up 30 connections per pooler pods. Default is 60 which will make up 30 connections per pod for the
pod for the default setup with two instances. 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`.
@ -631,4 +631,4 @@ operator being able to provide some reasonable defaults.
**connection_pool_default_cpu_limit** **connection_pool_default_cpu_limit**
**connection_pool_default_memory_limit** **connection_pool_default_memory_limit**
Default resource configuration for connection pool deployment. The internal Default resource configuration for connection pool deployment. The internal
default for memory limit and request is `100Mi`, for CPU it is `1`. default for memory request and limit is `100Mi`, for CPU it is `500m` and `1`.

10
docs/user.md
View File

@ -535,7 +535,7 @@ To configure a new connection pool, specify:
spec: spec:
connectionPool: connectionPool:
# how many instances of connection pool to create # how many instances of connection pool to create
number_of_instances: 1 number_of_instances: 2
# in which mode to run, session or transaction # in which mode to run, session or transaction
mode: "transaction" mode: "transaction"
@ -550,11 +550,11 @@ spec:
# resources for each instance # resources for each instance
resources: resources:
requests: requests:
cpu: "100m" cpu: 500m
memory: "100Mi" memory: 100Mi
limits: limits:
cpu: "100m" cpu: "1"
memory: "100Mi" memory: 100Mi
``` ```
By default `pgbouncer` is used to create a connection pool. To find out about By default `pgbouncer` is used to create a connection pool. To find out about

2
manifests/configmap.yaml
View File

@ -12,7 +12,7 @@ data:
cluster_labels: application:spilo cluster_labels: application:spilo
cluster_name_label: cluster-name cluster_name_label: cluster-name
# connection_pool_default_cpu_limit: "1" # connection_pool_default_cpu_limit: "1"
# connection_pool_default_cpu_request: "1" # connection_pool_default_cpu_request: "500m"
# connection_pool_default_memory_limit: 100Mi # connection_pool_default_memory_limit: 100Mi
# connection_pool_default_memory_request: 100Mi # connection_pool_default_memory_request: 100Mi
connection_pool_image: "registry.opensource.zalan.do/acid/pgbouncer:master-5" connection_pool_image: "registry.opensource.zalan.do/acid/pgbouncer:master-5"

2
manifests/operatorconfiguration.crd.yaml
View File

@ -326,7 +326,7 @@ spec:
connection_pool_default_cpu_request: connection_pool_default_cpu_request:
type: string type: string
pattern: '^(\d+m|\d+(\.\d{1,3})?)$' pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
#default: "1" #default: "500m"
connection_pool_default_memory_limit: connection_pool_default_memory_limit:
type: string type: string
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$' pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'

2
manifests/postgresql-operator-default-configuration.yaml
View File

@ -123,7 +123,7 @@ configuration:
# scalyr_server_url: "" # scalyr_server_url: ""
connection_pool: connection_pool:
connection_pool_default_cpu_limit: "1" connection_pool_default_cpu_limit: "1"
connection_pool_default_cpu_request: "1" connection_pool_default_cpu_request: "500m"
connection_pool_default_memory_limit: 100Mi connection_pool_default_memory_limit: 100Mi
connection_pool_default_memory_request: 100Mi connection_pool_default_memory_request: 100Mi
connection_pool_image: "registry.opensource.zalan.do/acid/pgbouncer:master-5" connection_pool_image: "registry.opensource.zalan.do/acid/pgbouncer:master-5"

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

@ -92,7 +92,7 @@ type ConnectionPool struct {
Image string `name:"connection_pool_image" default:"registry.opensource.zalan.do/acid/pgbouncer"` 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:"500m"`
ConnPoolDefaultMemoryRequest string `name:"connection_pool_default_memory_request" default:"100Mi"` ConnPoolDefaultMemoryRequest string `name:"connection_pool_default_memory_request" default:"100Mi"`
ConnPoolDefaultCPULimit string `name:"connection_pool_default_cpu_limit" default:"1"` ConnPoolDefaultCPULimit string `name:"connection_pool_default_cpu_limit" default:"1"`
ConnPoolDefaultMemoryLimit string `name:"connection_pool_default_memory_limit" default:"100Mi"` ConnPoolDefaultMemoryLimit string `name:"connection_pool_default_memory_limit" default:"100Mi"`

2
pkg/util/constants/pooler.go
View File

@ -6,7 +6,7 @@ const (
ConnectionPoolSchemaName = "pooler" ConnectionPoolSchemaName = "pooler"
ConnectionPoolDefaultType = "pgbouncer" ConnectionPoolDefaultType = "pgbouncer"
ConnectionPoolDefaultMode = "transaction" ConnectionPoolDefaultMode = "transaction"
ConnectionPoolDefaultCpuRequest = "1" ConnectionPoolDefaultCpuRequest = "500m"
ConnectionPoolDefaultCpuLimit = "1" ConnectionPoolDefaultCpuLimit = "1"
ConnectionPoolDefaultMemoryRequest = "100Mi" ConnectionPoolDefaultMemoryRequest = "100Mi"
ConnectionPoolDefaultMemoryLimit = "100Mi" ConnectionPoolDefaultMemoryLimit = "100Mi"