public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-08 01:42:23 +02:00
Code Issues Projects Releases Wiki Activity

adding the essential missing pieces

Browse Source
This commit is contained in:
Felix Kunde
2020-10-19 16:15:39 +02:00
parent c4ee9f9225
commit 7add4dc105
3 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/cluster.go
+10 -10
View File
@@ -1148,16 +1148,6 @@ func (c *Cluster) initHumanUsers() error {
}
}
if clusterIsOwnedBySuperuserTeam {
c.logger.Infof("Team %q owning the cluster is also a team of superusers. Created superuser roles for its members instead of admin roles.", c.Spec.TeamID)
return nil
}
err := c.initTeamMembers(c.Spec.TeamID, false)
if err != nil {
return fmt.Errorf("Cannot create a team %q of admins owning the PG cluster: %v", c.Spec.TeamID, err)
}
additionalTeams := c.PgTeamMap.GetAdditionalTeams(c.Spec.TeamID, true)
for _, additionalTeam := range additionalTeams {
if !(util.SliceContains(superuserTeams, additionalTeam)) {
@@ -1168,6 +1158,16 @@ func (c *Cluster) initHumanUsers() error {
}
}
if clusterIsOwnedBySuperuserTeam {
c.logger.Infof("Team %q owning the cluster is also a team of superusers. Created superuser roles for its members instead of admin roles.", c.Spec.TeamID)
return nil
}
err := c.initTeamMembers(c.Spec.TeamID, false)
if err != nil {
return fmt.Errorf("Cannot create a team %q of admins owning the PG cluster: %v", c.Spec.TeamID, err)
}
return nil
}