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

from Config

This commit is contained in:
Felix Kunde 2021-02-08 15:11:03 +01:00
parent fffeef874e
commit e6db1892dc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cluster/cluster.go
View File

@ -1144,7 +1144,7 @@ func (c *Cluster) initHumanUsers() error {
superuserTeams := []string{} superuserTeams := []string{}
if c.OpConfig.EnablePostgresTeamCRDSuperusers { if c.OpConfig.EnablePostgresTeamCRDSuperusers {
superuserTeams = c.PgTeamMap.GetAdditionalSuperuserTeams(c.Spec.TeamID, true) superuserTeams = c.Config.PgTeamMap.GetAdditionalSuperuserTeams(c.Spec.TeamID, true)
} }
for _, postgresSuperuserTeam := range c.OpConfig.PostgresSuperuserTeams { for _, postgresSuperuserTeam := range c.OpConfig.PostgresSuperuserTeams {
@ -1163,7 +1163,7 @@ func (c *Cluster) initHumanUsers() error {
} }
} }
additionalTeams := c.PgTeamMap.GetAdditionalTeams(c.Spec.TeamID, true) additionalTeams := c.Config.PgTeamMap.GetAdditionalTeams(c.Spec.TeamID, true)
for _, additionalTeam := range additionalTeams { for _, additionalTeam := range additionalTeams {
if !(util.SliceContains(superuserTeams, additionalTeam)) { if !(util.SliceContains(superuserTeams, additionalTeam)) {
err := c.initTeamMembers(additionalTeam, false) err := c.initTeamMembers(additionalTeam, false)

2
pkg/cluster/util.go
View File

@ -242,7 +242,7 @@ func (c *Cluster) getTeamMembers(teamID string) ([]string, error) {
members := []string{} members := []string{}
additionalMembers := []string{} additionalMembers := []string{}
for team, membership := range *c.PgTeamMap { for team, membership := range *c.Config.PgTeamMap {
if team == teamID { if team == teamID {
additionalMembers = membership.AdditionalMembers additionalMembers = membership.AdditionalMembers
} }