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

few minor fixes

This commit is contained in:
Felix Kunde 2021-06-09 10:22:25 +02:00
parent 775aa34d0d
commit fcd9d27f18
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/cluster/cluster.go
View File

@ -1170,6 +1170,7 @@ func (c *Cluster) initTeamMembers(teamID string, isPostgresSuperuserTeam bool) e
newRole := spec.PgUser{ newRole := spec.PgUser{
Origin: spec.RoleOriginTeamsAPI, Origin: spec.RoleOriginTeamsAPI,
Name: username, Name: username,
Namespace: c.Namespace,
Flags: flags, Flags: flags,
MemberOf: memberOf, MemberOf: memberOf,
Parameters: c.OpConfig.TeamAPIRoleConfiguration, Parameters: c.OpConfig.TeamAPIRoleConfiguration,

2
pkg/cluster/database.go
View File

@ -221,7 +221,7 @@ func (c *Cluster) readPgUsersFromDatabase(userNames []string) (users spec.PgUser
roldeleted = true roldeleted = true
} }
users[rolname] = spec.PgUser{Name: rolname, Password: rolpassword, Flags: flags, MemberOf: memberof, Parameters: parameters, Deleted: roldeleted} users[rolname] = spec.PgUser{Name: rolname, Namespace: c.Namespace, Password: rolpassword, Flags: flags, MemberOf: memberof, Parameters: parameters, Deleted: roldeleted}
} }
return users, nil return users, nil

4
pkg/cluster/sync.go
View File

@ -565,8 +565,8 @@ func (c *Cluster) syncRoles() (err error) {
userNames = append(userNames, pgRole) userNames = append(userNames, pgRole)
// add team member role 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 && c.OpConfig.EnableTeamMemberDeprecation { if u.Origin == spec.RoleOriginTeamsAPI && c.OpConfig.EnableTeamMemberDeprecation {
deletedUsers[u.Name+c.OpConfig.RoleDeletionSuffix] = u.Name deletedUsers[pgRole+c.OpConfig.RoleDeletionSuffix] = pgRole
userNames = append(userNames, u.Name+c.OpConfig.RoleDeletionSuffix) userNames = append(userNames, pgRole+c.OpConfig.RoleDeletionSuffix)
} }
} }

2
pkg/spec/types.go
View File

@ -49,7 +49,7 @@ const (
type PgUser struct { type PgUser struct {
Origin RoleOrigin `yaml:"-"` Origin RoleOrigin `yaml:"-"`
Name string `yaml:"-"` Name string `yaml:"-"`
Namespace string Namespace string `yaml:"-"`
Password string `yaml:"-"` Password string `yaml:"-"`
Flags []string `yaml:"user_flags"` Flags []string `yaml:"user_flags"`
MemberOf []string `yaml:"inrole"` MemberOf []string `yaml:"inrole"`