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

rework map selection in updateSecret (#2010)

This commit is contained in:
Felix Kunde 2022-08-24 17:33:39 +02:00 committed by GitHub
parent ef324494a0
commit 21d00e2ed7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cluster/pod.go
View File

@ -277,7 +277,7 @@ func (c *Cluster) MigrateMasterPod(podName spec.NamespacedName) error {
return nil return nil
} }
if masterCandidatePod, err = c.movePodFromEndOfLifeNode(masterCandidatePod); err != nil { if _, err = c.movePodFromEndOfLifeNode(masterCandidatePod); err != nil {
return fmt.Errorf("could not move pod: %v", err) return fmt.Errorf("could not move pod: %v", err)
} }

26
pkg/cluster/sync.go
View File

@ -715,20 +715,26 @@ func (c *Cluster) updateSecret(
} else if secretUsername == c.systemUsers[constants.ReplicationUserKeyName].Name { } else if secretUsername == c.systemUsers[constants.ReplicationUserKeyName].Name {
userKey = constants.ReplicationUserKeyName userKey = constants.ReplicationUserKeyName
userMap = c.systemUsers userMap = c.systemUsers
} else if _, exists := c.systemUsers[constants.ConnectionPoolerUserKeyName]; exists {
if secretUsername == c.systemUsers[constants.ConnectionPoolerUserKeyName].Name {
userKey = constants.ConnectionPoolerUserName
userMap = c.systemUsers
}
} else if _, exists := c.systemUsers[constants.EventStreamUserKeyName]; exists {
if secretUsername == c.systemUsers[constants.EventStreamUserKeyName].Name {
userKey = fmt.Sprintf("%s%s", constants.EventStreamSourceSlotPrefix, constants.UserRoleNameSuffix)
userMap = c.systemUsers
}
} else { } else {
userKey = secretUsername userKey = secretUsername
userMap = c.pgUsers userMap = c.pgUsers
} }
// use system user when pooler is enabled and pooler user is specfied in manifest
if _, exists := c.systemUsers[constants.ConnectionPoolerUserKeyName]; exists {
if secretUsername == c.systemUsers[constants.ConnectionPoolerUserKeyName].Name {
userKey = constants.ConnectionPoolerUserName
userMap = c.systemUsers
}
}
// use system user when streams are defined and fes_user is specfied in manifest
if _, exists := c.systemUsers[constants.EventStreamUserKeyName]; exists {
if secretUsername == c.systemUsers[constants.EventStreamUserKeyName].Name {
userKey = fmt.Sprintf("%s%s", constants.EventStreamSourceSlotPrefix, constants.UserRoleNameSuffix)
userMap = c.systemUsers
}
}
pwdUser := userMap[userKey] pwdUser := userMap[userKey]
secretName := util.NameFromMeta(secret.ObjectMeta) secretName := util.NameFromMeta(secret.ObjectMeta)