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

fix pooler sync with empty cluster name (#1448)

This commit is contained in:
Felix Kunde 2021-04-09 14:08:28 +02:00 committed by GitHub
parent 0745ce7cce
commit 6b73ac4282
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/cluster/connection_pooler.go
View File

@ -566,7 +566,7 @@ func needSyncConnectionPoolerSpecs(oldSpec, newSpec *acidv1.ConnectionPooler, lo
// Check if we need to synchronize connection pooler deployment due to new // Check if we need to synchronize connection pooler deployment due to new
// defaults, that are different from what we see in the DeploymentSpec // defaults, that are different from what we see in the DeploymentSpec
func needSyncConnectionPoolerDefaults(Config *Config, spec *acidv1.ConnectionPooler, deployment *appsv1.Deployment) (sync bool, reasons []string) { func (c *Cluster) needSyncConnectionPoolerDefaults(Config *Config, spec *acidv1.ConnectionPooler, deployment *appsv1.Deployment) (sync bool, reasons []string) {
reasons = []string{} reasons = []string{}
sync = false sync = false
@ -619,14 +619,14 @@ func needSyncConnectionPoolerDefaults(Config *Config, spec *acidv1.ConnectionPoo
ref := env.ValueFrom.SecretKeyRef.LocalObjectReference ref := env.ValueFrom.SecretKeyRef.LocalObjectReference
secretName := Config.OpConfig.SecretNameTemplate.Format( secretName := Config.OpConfig.SecretNameTemplate.Format(
"username", strings.Replace(config.User, "_", "-", -1), "username", strings.Replace(config.User, "_", "-", -1),
"cluster", deployment.ClusterName, "cluster", c.Name,
"tprkind", acidv1.PostgresCRDResourceKind, "tprkind", acidv1.PostgresCRDResourceKind,
"tprgroup", acidzalando.GroupName) "tprgroup", acidzalando.GroupName)
if ref.Name != secretName { if ref.Name != secretName {
sync = true sync = true
msg := fmt.Sprintf("pooler user is different (having %s, required %s)", msg := fmt.Sprintf("pooler user and secret are different (having %s, required %s)",
ref.Name, config.User) ref.Name, secretName)
reasons = append(reasons, msg) reasons = append(reasons, msg)
} }
} }
@ -747,7 +747,7 @@ func (c *Cluster) syncConnectionPooler(oldSpec, newSpec *acidv1.Postgresql, Look
Deployment: nil, Deployment: nil,
Service: nil, Service: nil,
Name: c.connectionPoolerName(role), Name: c.connectionPoolerName(role),
ClusterName: c.ClusterName, ClusterName: c.Name,
Namespace: c.Namespace, Namespace: c.Namespace,
LookupFunction: false, LookupFunction: false,
Role: role, Role: role,
@ -878,7 +878,7 @@ func (c *Cluster) syncConnectionPoolerWorker(oldSpec, newSpec *acidv1.Postgresql
specSync, specReason = needSyncConnectionPoolerSpecs(oldConnectionPooler, newConnectionPooler, c.logger) specSync, specReason = needSyncConnectionPoolerSpecs(oldConnectionPooler, newConnectionPooler, c.logger)
} }
defaultsSync, defaultsReason := needSyncConnectionPoolerDefaults(&c.Config, newConnectionPooler, deployment) defaultsSync, defaultsReason := c.needSyncConnectionPoolerDefaults(&c.Config, newConnectionPooler, deployment)
reason := append(specReason, defaultsReason...) reason := append(specReason, defaultsReason...)
if specSync || defaultsSync { if specSync || defaultsSync {