Merge eefb45ca5a into 8329a3eda4

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| commitlint | digest | `7e6e09f` → `a63b483` |
| controller-gen | digest | `7e6e09f` → `a63b483` |
| crd-gen-refs | digest | `7e6e09f` → `a63b483` |
| spellcheck | digest | `7e6e09f` → `a63b483` |
| uncommitted | digest | `7e6e09f` → `a63b483` |

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Never, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these
updates again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/cloudnative-pg/plugin-barman-cloud).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My41OS4wIiwidXBkYXRlZEluVmVyIjoiNDMuNTkuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiYXV0b21hdGVkIiwibm8taXNzdWUiXX0=-->

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Taskfile.yml

@@ -21,7 +21,7 @@ tasks:
       # renovate: datasource=git-refs depName=golangci-lint lookupName=https://github.com/sagikazarmark/daggerverse currentValue=main
       DAGGER_GOLANGCI_LINT_SHA: 5dcc7e4c4cd5ed230046955f42e27f2166545155
       # renovate: datasource=docker depName=golangci/golangci-lint versioning=semver
-      GOLANGCI_LINT_VERSION: v2.11.1
+      GOLANGCI_LINT_VERSION: v2.11.2
     cmds:
       - >
         GITHUB_REF= dagger -sc "github.com/sagikazarmark/daggerverse/golangci-lint@${DAGGER_GOLANGCI_LINT_SHA}
@@ -44,7 +44,7 @@ tasks:
       - wordlist-ordered
     env:
       # renovate: datasource=git-refs depName=spellcheck lookupName=https://github.com/cloudnative-pg/daggerverse currentValue=main
-      DAGGER_SPELLCHECK_SHA: 7e6e09f6b7d03a555a310b31285d2d4c74be3bfb
+      DAGGER_SPELLCHECK_SHA: a63b48356801e4d38291db105c26abd0650a99c9
     cmds:
       - >
         GITHUB_REF= dagger -s call -m github.com/cloudnative-pg/daggerverse/spellcheck@${DAGGER_SPELLCHECK_SHA}
@@ -58,7 +58,7 @@ tasks:
     desc: Check for conventional commits
     env:
       # renovate: datasource=git-refs depName=commitlint lookupName=https://github.com/cloudnative-pg/daggerverse currentValue=main
-      DAGGER_COMMITLINT_SHA: 7e6e09f6b7d03a555a310b31285d2d4c74be3bfb
+      DAGGER_COMMITLINT_SHA: a63b48356801e4d38291db105c26abd0650a99c9
     cmds:
       - >
         GITHUB_REF= dagger -s call -m github.com/cloudnative-pg/daggerverse/commitlint@${DAGGER_COMMITLINT_SHA}
@@ -72,7 +72,7 @@ tasks:
       - wordlist-ordered
     env:
       # renovate: datasource=git-refs depName=uncommitted lookupName=https://github.com/cloudnative-pg/daggerverse currentValue=main
-      DAGGER_UNCOMMITTED_SHA: 7e6e09f6b7d03a555a310b31285d2d4c74be3bfb
+      DAGGER_UNCOMMITTED_SHA: a63b48356801e4d38291db105c26abd0650a99c9
     cmds:
       - GITHUB_REF= dagger -s call -m github.com/cloudnative-pg/daggerverse/uncommitted@${DAGGER_UNCOMMITTED_SHA} check-uncommitted --source . stdout
     sources:
@@ -84,7 +84,7 @@ tasks:
       - controller-gen
     env:
       # renovate: datasource=git-refs depName=crd-gen-refs lookupName=https://github.com/cloudnative-pg/daggerverse currentValue=main
-      DAGGER_CRDGENREF_SHA: 7e6e09f6b7d03a555a310b31285d2d4c74be3bfb
+      DAGGER_CRDGENREF_SHA: a63b48356801e4d38291db105c26abd0650a99c9
       # renovate: datasource=go depName=github.com/elastic/crd-ref-docs
       CRDREFDOCS_VERSION: v0.3.0
     cmds:
@@ -386,7 +386,7 @@ tasks:
     run: once
     env:
       # renovate: datasource=git-refs depName=controller-gen lookupName=https://github.com/cloudnative-pg/daggerverse currentValue=main
-      DAGGER_CONTROLLER_GEN_SHA: 7e6e09f6b7d03a555a310b31285d2d4c74be3bfb
+      DAGGER_CONTROLLER_GEN_SHA: a63b48356801e4d38291db105c26abd0650a99c9
     cmds:
       - >
         GITHUB_REF= dagger -s call -m github.com/cloudnative-pg/daggerverse/controller-gen@${DAGGER_CONTROLLER_GEN_SHA}

containers/sidecar-requirements.in

@@ -1,3 +1,3 @@
 barman[azure,cloud,google,snappy,zstandard,lz4]==3.17.0
-setuptools==80.10.2
+setuptools==82.0.1
 zipp>=3.19.1 # not directly required, pinned by Snyk to avoid a vulnerability

containers/sidecar-requirements.txt

@@ -777,9 +777,9 @@ zstandard==0.25.0 \
     # via barman
 
 # The following packages are considered to be unsafe in a requirements file:
-setuptools==80.10.2 \
+setuptools==82.0.1 \
-    --hash=sha256:8b0e9d10c784bf7d262c4e5ec5d4ec94127ce206e8738f29a437945fbc219b70 \
+    --hash=sha256:7d872682c5d01cfde07da7bccc7b65469d3dca203318515ada1de5eda35efbf9 \
-    --hash=sha256:95b30ddfb717250edb492926c92b5221f7ef3fbcc2b07579bcd4a27da21d0173
+    --hash=sha256:a59e362652f08dcd477c78bb6e7bd9d80a7995bc73ce773050228a348ce2e5bb
     # via
     #   -r sidecar-requirements.in
     #   barman

internal/cnpgi/instance/recovery_window.go

@@ -33,7 +33,8 @@ import (
 )
 
 // updateRecoveryWindow updates the recovery window inside the object
-// store status subresource
+// store status subresource. It uses retry logic to handle concurrent
+// updates from backup completion and retention policy enforcement.
 func updateRecoveryWindow(
 	ctx context.Context,
 	c client.Client,
@@ -41,6 +42,14 @@ func updateRecoveryWindow(
 	objectStore *barmancloudv1.ObjectStore,
 	serverName string,
 ) error {
+	objectStoreKey := client.ObjectKeyFromObject(objectStore)
+
+	return retry.RetryOnConflict(retry.DefaultBackoff, func() error {
+		var freshObjectStore barmancloudv1.ObjectStore
+		if err := c.Get(ctx, objectStoreKey, &freshObjectStore); err != nil {
+			return err
+		}
+
 		// Set the recovery window inside the barman object store object
 		convertTime := func(t *time.Time) *metav1.Time {
 			if t == nil {
@@ -49,16 +58,17 @@ func updateRecoveryWindow(
 			return ptr.To(metav1.NewTime(*t))
 		}
 
-	recoveryWindow := objectStore.Status.ServerRecoveryWindow[serverName]
+		recoveryWindow := freshObjectStore.Status.ServerRecoveryWindow[serverName]
 		recoveryWindow.FirstRecoverabilityPoint = convertTime(backupList.GetFirstRecoverabilityPoint())
 		recoveryWindow.LastSuccessfulBackupTime = convertTime(backupList.GetLastSuccessfulBackupTime())
 
-	if objectStore.Status.ServerRecoveryWindow == nil {
+		if freshObjectStore.Status.ServerRecoveryWindow == nil {
-		objectStore.Status.ServerRecoveryWindow = make(map[string]barmancloudv1.RecoveryWindow)
+			freshObjectStore.Status.ServerRecoveryWindow = make(map[string]barmancloudv1.RecoveryWindow)
 		}
-	objectStore.Status.ServerRecoveryWindow[serverName] = recoveryWindow
+		freshObjectStore.Status.ServerRecoveryWindow[serverName] = recoveryWindow
 
-	return c.Status().Update(ctx, objectStore)
+		return c.Status().Update(ctx, &freshObjectStore)
+	})
 }
 
 // setLastFailedBackupTime sets the last failed backup time in the