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

Cleanup configuration

Browse Source 
Add pool configuration into CRD & charts. Add preliminary documentation.
Rename NumberOfInstances to Replicas like in Deployment. Mention couple
of potential improvement points for connection pool specification.
This commit is contained in:
Dmitrii Dolgov
2020-02-13 13:47:19 +01:00
parent f0ceafa81e
commit 2384e1ec10
15 changed files with 237 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/operator_config.go
+4 -8
View File
@@ -146,13 +146,13 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
// Connection pool. Looks like we can't use defaulting in CRD before 1.17,
// so ensure default values here.
result.ConnectionPool.NumberOfInstances = fromCRD.ConnectionPool.NumberOfInstances
if result.ConnectionPool.NumberOfInstances == nil ||
*result.ConnectionPool.NumberOfInstances < 1 {
result.ConnectionPool.Replicas = fromCRD.ConnectionPool.Replicas
if result.ConnectionPool.Replicas == nil ||
*result.ConnectionPool.Replicas < 1 {
var value int32
value = 1
result.ConnectionPool.NumberOfInstances = &value
result.ConnectionPool.Replicas = &value
}
result.ConnectionPool.Schema = util.Coalesce(
@@ -163,10 +163,6 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
fromCRD.ConnectionPool.User,
constants.ConnectionPoolUserName)
result.ConnectionPool.Type = util.Coalesce(
fromCRD.ConnectionPool.Type,
constants.ConnectionPoolDefaultType)
result.ConnectionPool.Image = util.Coalesce(
fromCRD.ConnectionPool.Image,
"pgbouncer:0.0.1")