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

View File

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

View File

@ -87,7 +87,7 @@ func (ptm *PostgresTeamMap) GetAdditionalTeams(team string, transitive bool) []s
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 {
return ptm.fetchAdditionalTeams(team, true, transitive, []string{})
}