K8SPG-700: remove redundant code

New pgbackup finalizer will remove the backup annotations. There is no
need to check annotations in the reconcile loop of pgcluster

Author: pooknull

percona/controller/pgcluster/backup.go

@@ -106,9 +106,6 @@ func (r *PGClusterReconciler) cleanupOutdatedBackups(ctx context.Context, cr *v2
 }
 
 func (r *PGClusterReconciler) reconcileBackupJobs(ctx context.Context, cr *v2.PerconaPGCluster) error {
-	if err := checkBackupAnnotations(ctx, r.Client, cr); err != nil {
-		return errors.Wrap(err, "check backup annotation")
-	}
 	for _, repo := range cr.Spec.Backups.PGBackRest.Repos {
 		backupJobs, err := listBackupJobs(ctx, r.Client, cr, repo.Name)
 		if err != nil {
@@ -124,38 +121,6 @@ func (r *PGClusterReconciler) reconcileBackupJobs(ctx context.Context, cr *v2.Pe
 	return nil
 }
 
-func checkBackupAnnotations(ctx context.Context, cl client.Client, cr *v2.PerconaPGCluster) error {
-	backupName := cr.Annotations[pNaming.AnnotationBackupInProgress]
-	if backupName == "" {
-		return nil
-	}
-
-	err := cl.Get(ctx, types.NamespacedName{Name: backupName, Namespace: cr.Namespace}, new(v2.PerconaPGBackup))
-	if err == nil {
-		return nil
-	}
-	if client.IgnoreNotFound(err) != nil {
-		return errors.Wrapf(err, "failed to get backup %s", backupName)
-	}
-
-	err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
-		pgCluster := new(v2.PerconaPGCluster)
-		err := cl.Get(ctx, client.ObjectKeyFromObject(cr), pgCluster)
-		if err != nil {
-			return err
-		}
-
-		delete(cr.Annotations, pNaming.AnnotationBackupInProgress)
-		delete(cr.Annotations, naming.PGBackRestBackup)
-
-		return cl.Update(ctx, cr)
-	})
-	if err != nil {
-		return errors.Wrap(err, "failed to update cluster annotation")
-	}
-	return nil
-}
-
 func reconcileBackupJob(ctx context.Context, cl client.Client, cr *v2.PerconaPGCluster, job batchv1.Job, repoName string) error {
 	pb, err := findPGBackup(ctx, cl, cr, job, repoName)
 	if err != nil {

percona/controller/pgcluster/backup_test.go

@@ -19,88 +19,6 @@ import (
 	"github.com/percona/percona-postgresql-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
 )
 
-func TestCheckBackupAnnotations(t *testing.T) {
-	ctx := context.Background()
-
-	const crName = "check-backup-annotations"
-	const backupName = "backup1"
-	const ns = crName
-
-	cr, err := readDefaultCR(crName, ns)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	pgBackup, err := readDefaultBackup(backupName, ns)
-	if err != nil {
-		t.Fatal(err)
-	}
-	pgBackup.Spec.PGCluster = crName
-
-	fakeClient, err := buildFakeClient(ctx, cr, pgBackup)
-	if err != nil {
-		t.Fatalf("failed to build fake client: %v", err)
-	}
-
-	reconciler := backupReconciler()
-	reconciler.Client = fakeClient
-
-	reconcile := func() {
-		backupNsName := types.NamespacedName{Name: backupName, Namespace: ns}
-
-		_, err = reconciler.Reconcile(ctx, ctrl.Request{NamespacedName: backupNsName})
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := fakeClient.Get(ctx, client.ObjectKeyFromObject(cr), cr); err != nil {
-			t.Fatal(err)
-		}
-		if err := fakeClient.Get(ctx, client.ObjectKeyFromObject(pgBackup), pgBackup); err != nil {
-			t.Fatal(err)
-		}
-	}
-	initialAnnotations := make(map[string]string)
-	for k, v := range cr.Annotations {
-		initialAnnotations[k] = v
-	}
-
-	reconcile()
-
-	startingAnnotations := make(map[string]string)
-	for k, v := range cr.Annotations {
-		startingAnnotations[k] = v
-	}
-
-	if pgBackup.Status.State != v2.BackupStarting {
-		t.Fatal("backup state is not Starting")
-	}
-
-	// Annotations should not be deleted if pgbackup is not deleted
-	if err := checkBackupAnnotations(ctx, fakeClient, cr); err != nil {
-		t.Fatal(err)
-	}
-	if err := fakeClient.Get(ctx, client.ObjectKeyFromObject(cr), cr); err != nil {
-		t.Fatal(err)
-	}
-	if !compareMaps(startingAnnotations, cr.Annotations) {
-		t.Fatal("cr annotations changed after check backup annotation")
-	}
-
-	// Annotations should be deleted if pgbackup is deleted
-	if err := fakeClient.Delete(ctx, pgBackup); err != nil {
-		t.Fatal(err)
-	}
-	if err := checkBackupAnnotations(ctx, fakeClient, cr); err != nil {
-		t.Fatal(err)
-	}
-	if err := fakeClient.Get(ctx, client.ObjectKeyFromObject(cr), cr); err != nil {
-		t.Fatal(err)
-	}
-	if !compareMaps(cr.Annotations, initialAnnotations) {
-		t.Fatal("annotations are have different size", cr.Annotations, initialAnnotations)
-	}
-}
-
 func compareMaps(x map[string]string, y map[string]string) bool {
 	if len(x) != len(y) {
 		return false