From 7ca5443706e0c2a8ea3426cd526fc0153af2b8d8 Mon Sep 17 00:00:00 2001
From: Andrii Dema <a.dema@jazzserve.com>
Date: Tue, 4 Aug 2026 13:44:32 +0300
Subject: [PATCH 1/2] K8SPG-992: remove keep-job finalizer if cluster is
 deleted

https://perconadev.atlassian.net/browse/K8SPG-992
---
 percona/controller/pgbackup/controller.go     | 27 +++++++++++++++++++
 .../controller/pgbackup/controller_test.go    | 20 +++++++++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/percona/controller/pgbackup/controller.go b/percona/controller/pgbackup/controller.go
index 807af85d1f..7818d19cec 100644
--- a/percona/controller/pgbackup/controller.go
+++ b/percona/controller/pgbackup/controller.go
@@ -403,6 +403,33 @@ func ensureFinalizers(ctx context.Context, cl client.Client, pgBackup *v2.Percon
 func deleteBackupFinalizer(c client.Client, pg *v2.PerconaPGCluster) func(ctx context.Context, pgBackup *v2.PerconaPGBackup) error {
 	return func(ctx context.Context, pgBackup *v2.PerconaPGBackup) error {
 		if pg == nil {
+			// If the cluster was previously deleted, we cannot call finishBackup to remove
+			// annotations from the PGCluster. In that case, we no longer need the job to
+			// exist and we can remove the keep-job finalizer.
+			job, err := findBackupJob(ctx, c, pgBackup)
+			if errors.Is(err, ErrBackupJobNotFound) || k8serrors.IsNotFound(err) {
+				return nil
+			}
+			if err != nil {
+				return errors.Wrap(err, "find backup job")
+			}
+
+			if !controllerutil.ContainsFinalizer(job, pNaming.FinalizerKeepJob) {
+				return nil
+			}
+
+			if err := retry.RetryOnConflict(retry.DefaultBackoff, func() error {
+				j := new(batchv1.Job)
+				if err := c.Get(ctx, client.ObjectKeyFromObject(job), j); err != nil {
+					return client.IgnoreNotFound(err)
+				}
+
+				controllerutil.RemoveFinalizer(j, pNaming.FinalizerKeepJob)
+				return c.Update(ctx, j)
+			}); err != nil {
+				return errors.Wrap(err, "remove keep-job finalizer")
+			}
+
 			return nil
 		}
 
diff --git a/percona/controller/pgbackup/controller_test.go b/percona/controller/pgbackup/controller_test.go
index 756a8252b5..aa9a6a9c0a 100644
--- a/percona/controller/pgbackup/controller_test.go
+++ b/percona/controller/pgbackup/controller_test.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	batchv1 "k8s.io/api/batch/v1"
 	coordinationv1 "k8s.io/api/coordination/v1"
 	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
@@ -15,6 +16,7 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	"github.com/percona/percona-postgresql-operator/v2/internal/feature"
@@ -80,7 +82,10 @@ func TestReconcileFailsBackupWhenClusterIsUnavailable(t *testing.T) {
 					PGCluster: cluster.Name,
 					RepoName:  new("repo1"),
 				},
-				Status: v2.PerconaPGBackupStatus{State: v2.BackupRunning},
+				Status: v2.PerconaPGBackupStatus{
+					State:   v2.BackupRunning,
+					JobName: "test-backup-job",
+				},
 			}
 			if tt.snapshot {
 				backup.Spec.Method = new(v2.BackupMethodVolumeSnapshot)
@@ -93,6 +98,13 @@ func TestReconcileFailsBackupWhenClusterIsUnavailable(t *testing.T) {
 			}
 
 			objects := []client.Object{backup}
+			if !tt.snapshot {
+				objects = append(objects, &batchv1.Job{ObjectMeta: metav1.ObjectMeta{
+					Name:       backup.Status.JobName,
+					Namespace:  backup.Namespace,
+					Finalizers: []string{pNaming.FinalizerKeepJob},
+				}})
+			}
 			if tt.snapshot {
 				holder := backupLeaseHolder(backup)
 				objects = append(objects, &coordinationv1.Lease{
@@ -134,6 +146,12 @@ func TestReconcileFailsBackupWhenClusterIsUnavailable(t *testing.T) {
 				assert.True(t, k8serrors.IsNotFound(err))
 			} else {
 				assert.NotContains(t, updated.Finalizers, pNaming.FinalizerDeleteBackup)
+
+				job := new(batchv1.Job)
+				require.NoError(t, cl.Get(ctx, client.ObjectKey{
+					Name: backup.Status.JobName, Namespace: backup.Namespace,
+				}, job))
+				assert.False(t, controllerutil.ContainsFinalizer(job, pNaming.FinalizerKeepJob))
 			}
 		})
 	}

From 0b4b01027a0b4ddc2aea4f5c9859ba882c2d7bf3 Mon Sep 17 00:00:00 2001
From: Andrii Dema <a.dema@jazzserve.com>
Date: Wed, 5 Aug 2026 14:24:04 +0300
Subject: [PATCH 2/2] `make generate`

---
 internal/controller/postgrescluster/pgtde_test.go | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/internal/controller/postgrescluster/pgtde_test.go b/internal/controller/postgrescluster/pgtde_test.go
index d684534203..94d6f4b08b 100644
--- a/internal/controller/postgrescluster/pgtde_test.go
+++ b/internal/controller/postgrescluster/pgtde_test.go
@@ -7,6 +7,8 @@ package postgrescluster
 import (
 	"context"
 	"io"
+	"maps"
+	"slices"
 	"strconv"
 	"strings"
 	"testing"
@@ -116,9 +118,7 @@ func tdeInstance(annotations map[string]string) *Instance {
 			}},
 		},
 	}
-	for k, v := range annotations {
-		pod.Annotations[k] = v
-	}
+	maps.Copy(pod.Annotations, annotations)
 
 	return &Instance{
 		Name: "instance1-abcd",
@@ -1275,12 +1275,7 @@ func failPatch(t *testing.T) func() error {
 
 // argsContain reports whether command contains arg.
 func argsContain(command []string, arg string) bool {
-	for _, c := range command {
-		if c == arg {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(command, arg)
 }
 
 func TestReconcilePostgresDatabasesPGTDEReporting(t *testing.T) {