rework map selection in updateSecret (#2010)

FxKu · web-flow · commit 21d00e2ed736 · 2022-08-24T17:33:39.000+02:00
diff --git a/pkg/cluster/pod.go b/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)
 	}
 
diff --git a/pkg/cluster/sync.go b/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)
 

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ func (c *Cluster) MigrateMasterPod(podName spec.NamespacedName) error {`
`277`	`277`	`return nil`
`278`	`278`	`}`
`279`	`279`
`280`		`- if masterCandidatePod, err = c.movePodFromEndOfLifeNode(masterCandidatePod); err != nil {`
	`280`	`+ if _, err = c.movePodFromEndOfLifeNode(masterCandidatePod); err != nil {`
`281`	`281`	`return fmt.Errorf("could not move pod: %v", err)`
`282`	`282`	`}`
`283`	`283`