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

fix initHumanUsers

This commit is contained in:
Felix Kunde 2020-10-16 09:50:55 +02:00
parent 354f568443
commit 8372c00127
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/cluster/cluster.go
View File

@ -1133,16 +1133,13 @@ func (c *Cluster) initHumanUsers() error {
superuserTeams := c.PgTeamMap.GetAdditionalSuperuserTeams(c.Spec.TeamID, true) superuserTeams := c.PgTeamMap.GetAdditionalSuperuserTeams(c.Spec.TeamID, true)
var clusterIsOwnedBySuperuserTeam bool var clusterIsOwnedBySuperuserTeam bool
for _, postgresSuperuserTeam := range c.OpConfig.PostgresSuperuserTeams { for _, postgresSuperuserTeam := range c.OpConfig.PostgresSuperuserTeams {
isAdditionalSuperuserTeam := false if !(util.SliceContains(superuserTeams, postgresSuperuserTeam)) {
for _, superuserTeam := range superuserTeams { superuserTeams = append(superuserTeams, postgresSuperuserTeam)
if postgresSuperuserTeam == superuserTeam {
isAdditionalSuperuserTeam = true
}
} }
} }
for _, superuserTeam := range superuserTeams { for _, superuserTeam := range superuserTeams {
err := c.initTeamMembers(adminTeam, true) err := c.initTeamMembers(superuserTeam, true)
if err != nil { if err != nil {
return fmt.Errorf("Cannot create team %q of Postgres superusers: %v", superuserTeam, err) return fmt.Errorf("Cannot create team %q of Postgres superusers: %v", superuserTeam, err)
} }

2
pkg/teams/postgres_team.go
View File

@ -87,7 +87,7 @@ func (ptm *PostgresTeamMap) GetAdditionalTeams(team string, transitive bool) []s
return ptm.fetchAdditionalTeams(team, false, transitive, []string{}) return ptm.fetchAdditionalTeams(team, false, transitive, []string{})
} }
// GetAdditionalTeams function to retrieve list of additional teams // GetAdditionalSuperuserTeams function to retrieve list of additional superuser teams
func (ptm *PostgresTeamMap) GetAdditionalSuperuserTeams(team string, transitive bool) []string { func (ptm *PostgresTeamMap) GetAdditionalSuperuserTeams(team string, transitive bool) []string {
return ptm.fetchAdditionalTeams(team, true, transitive, []string{}) return ptm.fetchAdditionalTeams(team, true, transitive, []string{})
} }