Merge c5dafb3dbf into a95197e648

Corrected path for retention policy in documentation.

Closes #1061

Signed-off-by: dblugeon <dblugeon@users.noreply.github.com>

Taskfile.yml

@@ -23,7 +23,7 @@ tasks:
       # renovate: datasource=git-refs depName=golangci-lint lookupName=https://github.com/sagikazarmark/daggerverse currentValue=main
       DAGGER_GOLANGCI_LINT_SHA: ff27cd50f6b4eed2e3753c520632cd6099e1ce52
       # renovate: datasource=docker depName=golangci/golangci-lint versioning=semver
-      GOLANGCI_LINT_VERSION: v2.13.1
+      GOLANGCI_LINT_VERSION: v2.13.2
     cmds:
       - >
         GITHUB_REF= dagger -sc "github.com/sagikazarmark/daggerverse/golangci-lint@${DAGGER_GOLANGCI_LINT_SHA}

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,
 			},
 		},

web/docs/concepts.md

@@ -35,7 +35,7 @@ object storage system. It allows you to configure:
 - **Base backup options**—with similar settings for compression, concurrency,
   and encryption—under `.spec.configuration.data`
 - **Retention policies** to manage the life-cycle of archived WALs and backups
-  via `.spec.configuration.retentionPolicy`
+  via `.spec.retentionPolicy`
 
 WAL files are archived in the `wals` directory, while base backups are stored
 as **tarballs** in the `base` directory, following the