K8SPG-619: fix applying backoffLimit for backup jobs (#1024)

https://perconadev.atlassian.net/browse/K8SPG-619 Co-authored-by: Viacheslav Sarzhan <[email protected]>
percona · Jan 28, 2025 · 04948b2 · 04948b2
1 parent a8405e5
commit 04948b2
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 1 deletion.
diff --git a/e2e-tests/tests/demand-backup/01-create-cluster.yaml b/e2e-tests/tests/demand-backup/01-create-cluster.yaml
@@ -14,4 +14,6 @@ commands:
         | yq '.spec.backups.pgbackrest.global.repo1-retention-full-type="count"' \
         | yq '.spec.backups.pgbackrest.global.repo3-retention-full="2"' \
         | yq '.spec.backups.pgbackrest.global.repo3-retention-full-type="count"' \
+        | yq '.spec.backups.pgbackrest.jobs.backoffLimit=20' \
+        | yq '.spec.backups.pgbackrest.jobs.restartPolicy="OnFailure"' \
         | kubectl -n "${NAMESPACE}" apply -f -
diff --git a/e2e-tests/tests/demand-backup/04-assert.yaml b/e2e-tests/tests/demand-backup/04-assert.yaml
@@ -15,6 +15,70 @@ metadata:
       kind: PerconaPGBackup
       controller: true
       blockOwnerDeletion: true
+spec:
+  backoffLimit: 20
+  template:
+    metadata:
+      annotations:
+        postgres-operator.crunchydata.com/pgbackrest-backup: demand-backup-full-s3
+    spec:
+      containers:
+      - command:
+        - /opt/crunchy/bin/pgbackrest
+        imagePullPolicy: Always
+        name: pgbackrest
+        resources: {}
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          privileged: false
+          readOnlyRootFilesystem: true
+          runAsNonRoot: true
+          seccompProfile:
+            type: RuntimeDefault
+        terminationMessagePath: /dev/termination-log
+        terminationMessagePolicy: File
+        volumeMounts:
+        - mountPath: /etc/pgbackrest/conf.d
+          name: pgbackrest-config
+          readOnly: true
+      dnsPolicy: ClusterFirst
+      enableServiceLinks: false
+      restartPolicy: OnFailure
+      schedulerName: default-scheduler
+      securityContext:
+        fsGroupChangePolicy: OnRootMismatch
+      serviceAccount: demand-backup-pgbackrest
+      serviceAccountName: demand-backup-pgbackrest
+      terminationGracePeriodSeconds: 30
+      volumes:
+      - name: pgbackrest-config
+        projected:
+          defaultMode: 420
+          sources:
+          - secret:
+              name: demand-backup-pgbackrest-secrets
+          - configMap:
+              items:
+              - key: pgbackrest_repo.conf
+                path: pgbackrest_repo.conf
+              - key: config-hash
+                path: config-hash
+              - key: pgbackrest-server.conf
+                path: ~postgres-operator_server.conf
+              name: demand-backup-pgbackrest-config
+          - secret:
+              items:
+              - key: pgbackrest.ca-roots
+                path: ~postgres-operator/tls-ca.crt
+              - key: pgbackrest-client.crt
+                path: ~postgres-operator/client-tls.crt
+              - key: pgbackrest-client.key
+                mode: 384
+                path: ~postgres-operator/client-tls.key
+              name: demand-backup-pgbackrest
 status:
   succeeded: 1
 ---

diff --git a/internal/controller/postgrescluster/pgbackrest.go b/internal/controller/postgrescluster/pgbackrest.go
@@ -866,7 +866,7 @@ func generateBackupJobSpecIntent(ctx context.Context, postgresCluster *v1beta1.P
 			jobSpec.Template.Spec.RestartPolicy = postgresCluster.Spec.Backups.PGBackRest.Jobs.RestartPolicy
 		}
 		// K8SPG-619
-		if jobSpec.BackoffLimit != nil {
+		if postgresCluster.Spec.Backups.PGBackRest.Jobs.BackoffLimit != nil {
 			jobSpec.BackoffLimit = postgresCluster.Spec.Backups.PGBackRest.Jobs.BackoffLimit
 		}
 	}