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

reflect code review

Browse Source
This commit is contained in:
Felix Kunde
2021-04-21 17:16:43 +02:00
parent f18cc4913d
commit 5eac3e86ac
3 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/cluster.go
+2 -3
View File
@@ -646,11 +646,10 @@ func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error {
c.logger.Debugf("initialize users")
// save current state of pgUsers to check for deleted roles later
if len(c.pgUsers) > 0 {
usersCache := map[string]spec.PgUser{}
c.pgUsersCache = map[string]spec.PgUser{}
for k, v := range c.pgUsers {
usersCache[k] = v
c.pgUsersCache[k] = v
}
c.pgUsersCache = usersCache
}
if err := c.initUsers(); err != nil {
c.logger.Errorf("could not init users: %v", err)
pkg/cluster/sync.go
+3 -4
View File
@@ -39,11 +39,10 @@ func (c *Cluster) Sync(newSpec *acidv1.Postgresql) error {
// save current state of pgUsers to check for deleted roles later
if len(c.pgUsers) > 0 {
usersCache := map[string]spec.PgUser{}
c.pgUsersCache = map[string]spec.PgUser{}
for k, v := range c.pgUsers {
usersCache[k] = v
c.pgUsersCache[k] = v
}
c.pgUsersCache = usersCache
}
if err = c.initUsers(); err != nil {
err = fmt.Errorf("could not init users: %v", err)
@@ -586,7 +585,7 @@ func (c *Cluster) syncRoles() (err error) {
for _, u := range c.pgUsers {
userNames = append(userNames, u.Name)
// add team user name with rename suffix in case we need to rename it back
// add team member role name with rename suffix in case we need to rename it back
if u.Origin == spec.RoleOriginTeamsAPI {
userNames = append(userNames, u.Name+constants.RoleRenameSuffix)
}