Merge bdf568f48f into 4bbaf18cd3

Signed-off-by: Toomas Pelberg <toomasp@gmx.net>

internal/cnpgi/operator/specs/role.go

@@ -124,6 +124,10 @@ func ObjectStoreNamesFromRole(role *rbacv1.Role) []string {
 func BuildRoleBinding(
 	cluster *cnpgv1.Cluster,
 ) *rbacv1.RoleBinding {
+	clusterServiceAccountName := cluster.Name
+	if cluster.Spec.ServiceAccountName != "" {
+		clusterServiceAccountName = cluster.Spec.ServiceAccountName
+	}
 	return &rbacv1.RoleBinding{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: cluster.Namespace,
@@ -134,7 +138,7 @@ func BuildRoleBinding(
 			{
 				Kind:      "ServiceAccount",
 				APIGroup:  "",
-				Name:      cluster.Name,
+				Name:      clusterServiceAccountName,
 				Namespace: cluster.Namespace,
 			},
 		},