From fcd9d27f18f9b04c33ad0fed464031f4da30dbb7 Mon Sep 17 00:00:00 2001
From: Felix Kunde <felix-kunde@gmx.de>
Date: Wed, 9 Jun 2021 10:22:25 +0200
Subject: [PATCH] few minor fixes

---
 pkg/cluster/cluster.go  | 1 +
 pkg/cluster/database.go | 2 +-
 pkg/cluster/sync.go     | 4 ++--
 pkg/spec/types.go       | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
index ced184877..8f5f047d8 100644
--- a/pkg/cluster/cluster.go
+++ b/pkg/cluster/cluster.go
@@ -1170,6 +1170,7 @@ 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 829c2e5c7..3d4216dfb 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, Password: rolpassword, Flags: flags, MemberOf: memberof, Parameters: parameters, Deleted: roldeleted}
+		users[rolname] = spec.PgUser{Name: rolname, Namespace: c.Namespace, 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 3fa0648c0..dcf577abb 100644
--- a/pkg/cluster/sync.go
+++ b/pkg/cluster/sync.go
@@ -565,8 +565,8 @@ func (c *Cluster) syncRoles() (err error) {
 		userNames = append(userNames, pgRole)
 		// add team member role name with rename suffix in case we need to rename it back
 		if u.Origin == spec.RoleOriginTeamsAPI && c.OpConfig.EnableTeamMemberDeprecation {
-			deletedUsers[u.Name+c.OpConfig.RoleDeletionSuffix] = u.Name
-			userNames = append(userNames, u.Name+c.OpConfig.RoleDeletionSuffix)
+			deletedUsers[pgRole+c.OpConfig.RoleDeletionSuffix] = pgRole
+			userNames = append(userNames, pgRole+c.OpConfig.RoleDeletionSuffix)
 		}
 	}
 
diff --git a/pkg/spec/types.go b/pkg/spec/types.go
index 4e7306294..533aae79f 100644
--- a/pkg/spec/types.go
+++ b/pkg/spec/types.go
@@ -47,9 +47,9 @@ const (
 
 // PgUser contains information about a single user.
 type PgUser struct {
-	Origin     RoleOrigin `yaml:"-"`
-	Name       string     `yaml:"-"`
-	Namespace  string
+	Origin     RoleOrigin        `yaml:"-"`
+	Name       string            `yaml:"-"`
+	Namespace  string            `yaml:"-"`
 	Password   string            `yaml:"-"`
 	Flags      []string          `yaml:"user_flags"`
 	MemberOf   []string          `yaml:"inrole"`