Delete if a new specification is nil
Use coalesce for username too.
This commit is contained in:
parent
35d82e5a17
commit
97217e27ed
|
|
@ -868,10 +868,9 @@ func (c *Cluster) initSystemUsers() {
|
||||||
c.Spec.ConnectionPool = &acidv1.ConnectionPool{}
|
c.Spec.ConnectionPool = &acidv1.ConnectionPool{}
|
||||||
}
|
}
|
||||||
|
|
||||||
username := c.Spec.ConnectionPool.User
|
username := util.Coalesce(
|
||||||
if username == "" {
|
c.Spec.ConnectionPool.User,
|
||||||
username = c.OpConfig.ConnectionPool.User
|
c.OpConfig.ConnectionPool.User)
|
||||||
}
|
|
||||||
|
|
||||||
c.systemUsers[constants.ConnectionPoolUserKeyName] = spec.PgUser{
|
c.systemUsers[constants.ConnectionPoolUserKeyName] = spec.PgUser{
|
||||||
Origin: spec.RoleConnectionPool,
|
Origin: spec.RoleConnectionPool,
|
||||||
|
|
|
||||||
|
|
@ -115,6 +115,14 @@ func (c *Cluster) Sync(newSpec *acidv1.Postgresql) error {
|
||||||
oldPool := oldSpec.Spec.ConnectionPool
|
oldPool := oldSpec.Spec.ConnectionPool
|
||||||
newPool := newSpec.Spec.ConnectionPool
|
newPool := newSpec.Spec.ConnectionPool
|
||||||
|
|
||||||
|
if newPool == nil {
|
||||||
|
// previously specified connectionPool was removed, so delete
|
||||||
|
// connection pool
|
||||||
|
if err := c.deleteConnectionPool(); err != nil {
|
||||||
|
c.logger.Warningf("could not remove connection pool: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// do sync in case if any resources were not remembered (it means they
|
// do sync in case if any resources were not remembered (it means they
|
||||||
// probably were not created, or if specification differs
|
// probably were not created, or if specification differs
|
||||||
if c.ConnectionPool == nil ||
|
if c.ConnectionPool == nil ||
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue