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

Resolve review comments

This commit is contained in:
Rafia Sabih 2020-09-11 10:17:43 +02:00
parent 770fc1e612
commit 46ff4bb738
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/cluster/resources.go
View File

@ -189,13 +189,18 @@ func (c *Cluster) createConnectionPooler(lookup InstallFunction) (*ConnectionPoo
if err != nil { if err != nil {
return nil, err return nil, err
} }
c.ConnectionPooler = &ConnectionPoolerObjects{
ReplDeployment: repldeployment, if c.needMasterConnectionPooler() {
ReplService: replService, c.ConnectionPooler.ReplDeployment = repldeployment
c.ConnectionPooler.ReplService = replService
} else {
c.ConnectionPooler = &ConnectionPoolerObjects{
ReplDeployment: repldeployment,
ReplService: replService,
}
} }
c.logger.Debugf("created new connection pooler for replica %q, uid: %q", c.logger.Debugf("created new connection pooler for replica %q, uid: %q",
util.NameFromMeta(repldeployment.ObjectMeta), repldeployment.UID) util.NameFromMeta(repldeployment.ObjectMeta), repldeployment.UID)
} }
return c.ConnectionPooler, nil return c.ConnectionPooler, nil
@ -214,7 +219,7 @@ func (c *Cluster) deleteConnectionPooler(role PostgresRole) (err error) {
// Clean up the deployment object. If deployment resource we've remembered // Clean up the deployment object. If deployment resource we've remembered
// is somehow empty, try to delete based on what would we generate // is somehow empty, try to delete based on what would we generate
deploymentName := c.connectionPoolerName(role) var deploymentName string
var deployment *appsv1.Deployment var deployment *appsv1.Deployment
if role == Master { if role == Master {

4
pkg/cluster/sync.go
View File

@ -1005,10 +1005,8 @@ func (c *Cluster) syncConnectionPoolerWorker(oldSpec, newSpec *acidv1.Postgresql
specSync, specReason := c.needSyncConnectionPoolerSpecs(oldConnectionPooler, newConnectionPooler) specSync, specReason := c.needSyncConnectionPoolerSpecs(oldConnectionPooler, newConnectionPooler)
defaultsSync, defaultsReason := c.needSyncConnectionPoolerDefaults(newConnectionPooler, deployment) defaultsSync, defaultsReason := c.needSyncConnectionPoolerDefaults(newConnectionPooler, deployment)
reason := append(specReason, defaultsReason...) reason := append(specReason, defaultsReason...)
c.logger.Warningf("role and reason %v, %v", role, reason)
if specSync || defaultsSync { if specSync || defaultsSync {
c.logger.Infof("Update connection pooler deployment %s, reason: %+v",
c.connectionPoolerName(role), reason)
newDeploymentSpec, err := c.generateConnectionPoolerDeployment(&newSpec.Spec, role) newDeploymentSpec, err := c.generateConnectionPoolerDeployment(&newSpec.Spec, role)
if err != nil { if err != nil {