rework map selection in updateSecret (zalando#2010)

Author: FxKu

pkg/cluster/pod.go

@@ -277,7 +277,7 @@ func (c *Cluster) MigrateMasterPod(podName spec.NamespacedName) error {
 		return nil
 	}
 
-	if masterCandidatePod, err = c.movePodFromEndOfLifeNode(masterCandidatePod); err != nil {
+	if _, err = c.movePodFromEndOfLifeNode(masterCandidatePod); err != nil {
 		return fmt.Errorf("could not move pod: %v", err)
 	}
 

pkg/cluster/sync.go

@@ -715,20 +715,26 @@ func (c *Cluster) updateSecret(
 	} else if secretUsername == c.systemUsers[constants.ReplicationUserKeyName].Name {
 		userKey = constants.ReplicationUserKeyName
 		userMap = c.systemUsers
-	} else if _, exists := c.systemUsers[constants.ConnectionPoolerUserKeyName]; exists {
+	} else {
+		userKey = secretUsername
+		userMap = c.pgUsers
+	}
+
+	// use system user when pooler is enabled and pooler user is specfied in manifest
+	if _, exists := c.systemUsers[constants.ConnectionPoolerUserKeyName]; exists {
 		if secretUsername == c.systemUsers[constants.ConnectionPoolerUserKeyName].Name {
 			userKey = constants.ConnectionPoolerUserName
 			userMap = c.systemUsers
 		}
-	} else if _, exists := c.systemUsers[constants.EventStreamUserKeyName]; exists {
+	}
+	// use system user when streams are defined and fes_user is specfied in manifest
+	if _, exists := c.systemUsers[constants.EventStreamUserKeyName]; exists {
 		if secretUsername == c.systemUsers[constants.EventStreamUserKeyName].Name {
 			userKey = fmt.Sprintf("%s%s", constants.EventStreamSourceSlotPrefix, constants.UserRoleNameSuffix)
 			userMap = c.systemUsers
 		}
-	} else {
-		userKey = secretUsername
-		userMap = c.pgUsers
 	}
+
 	pwdUser := userMap[userKey]
 	secretName := util.NameFromMeta(secret.ObjectMeta)