Always return a PVC object when applying repo volume intent

tjmoore4 · tjmoore4 · commit 8f3511dd3fc7 · 2025-09-05T15:17:57.000-04:00
In order to ensure the repo volume statuses are not cleared when
an error is encountered, always return the PVC object from the
applyRepoVolumeIntent function.

Issue: PGO-1427
diff --git a/internal/controller/postgrescluster/pgbackrest.go b/internal/controller/postgrescluster/pgbackrest.go
@@ -176,12 +176,8 @@ func (r *Reconciler) applyRepoVolumeIntent(ctx context.Context,
 		return nil, errors.WithStack(err)
 	}
 
-	if err := r.apply(ctx, repo); err != nil {
-		return nil, r.handlePersistentVolumeClaimError(postgresCluster,
-			errors.WithStack(err))
-	}
-
-	return repo, nil
+	return repo, r.handlePersistentVolumeClaimError(
+		postgresCluster, errors.WithStack(r.apply(ctx, repo)))
 }
 
 // +kubebuilder:rbac:groups="apps",resources="statefulsets",verbs={list}

Original file line number	Diff line number	Diff line change
`@@ -176,12 +176,8 @@ func (r *Reconciler) applyRepoVolumeIntent(ctx context.Context,`
`176`	`176`	`return nil, errors.WithStack(err)`
`177`	`177`	`}`
`178`	`178`
`179`		`- if err := r.apply(ctx, repo); err != nil {`
`180`		`- return nil, r.handlePersistentVolumeClaimError(postgresCluster,`
`181`		`- errors.WithStack(err))`
`182`		`- }`
`183`		`-`
`184`		`- return repo, nil`
	`179`	`+ return repo, r.handlePersistentVolumeClaimError(`
	`180`	`+ postgresCluster, errors.WithStack(r.apply(ctx, repo)))`
`185`	`181`	`}`
`186`	`182`
`187`	`183`	`// +kubebuilder:rbac:groups="apps",resources="statefulsets",verbs={list}`