public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-05 23:11:10 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/acid.zalan.do/v1/crds.go
+9 -3
View File
@@ -182,6 +182,9 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
"dockerImage": {
Type: "string",
},
"maxDBConnections": {
Type: "integer",
},
"mode": {
Type: "string",
Enum: []apiextv1beta1.JSON{
@@ -1129,9 +1132,8 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
"connection_pool_image": {
Type: "string",
},
"connection_pool_replicas": {
Type: "integer",
Minimum: &min1,
"connection_pool_max_db_connections": {
Type: "integer",
},
"connection_pool_mode": {
Type: "string",
@@ -1144,6 +1146,10 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
},
},
},
"connection_pool_number_of_instances": {
Type: "integer",
Minimum: &min1,
},
"connection_pool_schema": {
Type: "string",
},
pkg/util/config/config.go
+3 -3
View File
@@ -88,13 +88,13 @@ type ConnectionPool struct {
NumberOfInstances *int32 `name:"connection_pool_number_of_instances" default:"1"`
Schema string `name:"connection_pool_schema" default:"pooler"`
User string `name:"connection_pool_user" default:"pooler"`
Image string `name:"connection_pool_image" default:"pgbouncer:1.0"`
Mode string `name:"connection_pool_mode" default:"session"`
Image string `name:"connection_pool_image" default:"registry.opensource.zalan.do/acid/pgbouncer:master-5"`
Mode string `name:"connection_pool_mode" default:"transaction"`
MaxDBConnections *int32 `name:"connection_pool_max_db_connections" default:"60"`
ConnPoolDefaultCPURequest string `name:"connection_pool_default_cpu_request" default:"100m"`
ConnPoolDefaultMemoryRequest string `name:"connection_pool_default_memory_request" default:"100Mi"`
ConnPoolDefaultCPULimit string `name:"connection_pool_default_cpu_limit" default:"3"`
ConnPoolDefaultMemoryLimit string `name:"connection_pool_default_memory_limit" default:"1Gi"`
MaxDBConnections *int32 `name:"connection_pool_max_db_connections" default:"60"`
}
// Config describes operator config