From 27c6ac256533daaac41e54ac43c0ea3324f74d8c Mon Sep 17 00:00:00 2001
From: Felix Kunde <felix-kunde@gmx.de>
Date: Wed, 9 Jun 2021 10:37:08 +0200
Subject: [PATCH] fix unit tests

---
 pkg/cluster/cluster.go  | 1 -
 pkg/cluster/database.go | 2 +-
 pkg/cluster/sync.go     | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
index 8f5f047d8..ced184877 100644
--- a/pkg/cluster/cluster.go
+++ b/pkg/cluster/cluster.go
@@ -1170,7 +1170,6 @@ func (c *Cluster) initTeamMembers(teamID string, isPostgresSuperuserTeam bool) e
 		newRole := spec.PgUser{
 			Origin:     spec.RoleOriginTeamsAPI,
 			Name:       username,
-			Namespace:  c.Namespace,
 			Flags:      flags,
 			MemberOf:   memberOf,
 			Parameters: c.OpConfig.TeamAPIRoleConfiguration,
diff --git a/pkg/cluster/database.go b/pkg/cluster/database.go
index 3d4216dfb..829c2e5c7 100644
--- a/pkg/cluster/database.go
+++ b/pkg/cluster/database.go
@@ -221,7 +221,7 @@ func (c *Cluster) readPgUsersFromDatabase(userNames []string) (users spec.PgUser
 			roldeleted = true
 		}
 
-		users[rolname] = spec.PgUser{Name: rolname, Namespace: c.Namespace, Password: rolpassword, Flags: flags, MemberOf: memberof, Parameters: parameters, Deleted: roldeleted}
+		users[rolname] = spec.PgUser{Name: rolname, Password: rolpassword, Flags: flags, MemberOf: memberof, Parameters: parameters, Deleted: roldeleted}
 	}
 
 	return users, nil
diff --git a/pkg/cluster/sync.go b/pkg/cluster/sync.go
index dcf577abb..79dceedd5 100644
--- a/pkg/cluster/sync.go
+++ b/pkg/cluster/sync.go
@@ -557,7 +557,7 @@ func (c *Cluster) syncRoles() (err error) {
 	// create list of database roles to query
 	for _, u := range c.pgUsers {
 		pgRole := u.Name
-		if u.Namespace != c.Namespace {
+		if u.Namespace != c.Namespace && u.Namespace != "" {
 			// to avoid the conflict of having multiple users of same name
 			// but each in different namespace.
 			pgRole = fmt.Sprintf("%s.%s", u.Name, u.Namespace)