Merge c5dafb3dbf into 0bb78879ce

Merge branch 'main' into correct-cluster-serviceaccount
2026-07-07 02:02:21 +02:00 · 2026-06-02 16:29:24 -04:00 · 2026-05-25 13:16:53 +03:00 · 2026-05-13 10:06:30 +03:00 · 2026-04-22 15:35:43 +03:00
1 changed files with 5 additions and 1 deletions
--- a/internal/cnpgi/operator/specs/role.go
+++ b/internal/cnpgi/operator/specs/role.go
@ -126,6 +126,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,
@ -136,7 +140,7 @@ func BuildRoleBinding(
 			{
 				Kind:      "ServiceAccount",
 				APIGroup:  "",
-				Name:      cluster.Name,
+				Name:      clusterServiceAccountName,
 				Namespace: cluster.Namespace,
 			},
 		},
Author	SHA1	Message	Date
Toomas Pelberg	6e0a9fb737	Merge `c5dafb3dbf` into `0bb78879ce`	2026-06-02 16:29:24 -04:00
Toomas Pelberg	c5dafb3dbf	Merge branch 'main' into correct-cluster-serviceaccount	2026-05-25 13:16:53 +03:00
Toomas Pelberg	50c55fd075	Merge branch 'main' into correct-cluster-serviceaccount	2026-05-13 10:06:30 +03:00
Toomas Pelberg	bdf568f48f	Use specified ServiceAccountName in RoleBinding Signed-off-by: Toomas Pelberg <toomasp@gmx.net>	2026-04-22 15:35:43 +03:00