From 56f10cf9666a37ec385192176214a4f48e44127e Mon Sep 17 00:00:00 2001
From: aknochow <aknochow@redhat.com>
Date: Thu, 5 Mar 2026 07:22:22 -0500
Subject: [PATCH] Fix custom backup PVC name not used with create_backup_pvc
 (#2105)

Use backup_pvc for custom backup PVC name in templates

When backup_pvc is specified with create_backup_pvc: true, the PVC
template and ownerReference removal used the hardcoded default name
(deployment_name-backup-claim) instead of the user-specified name.
This caused the management pod to reference a PVC that didn't exist.

Replace backup_claim variable with backup_pvc throughout the backup
role so the resolved PVC name is used consistently in all templates.

Authored By: Adam Knochowski <aknochow@redhat.com>
Assisted By: Claude
---
 roles/backup/tasks/init.yml                  | 4 ++--
 roles/backup/tasks/update_status.yml         | 2 +-
 roles/backup/templates/backup_pvc.yml.j2     | 2 +-
 roles/backup/templates/management-pod.yml.j2 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/roles/backup/tasks/init.yml b/roles/backup/tasks/init.yml
index a24f12e7..b2377d4e 100644
--- a/roles/backup/tasks/init.yml
+++ b/roles/backup/tasks/init.yml
@@ -43,7 +43,7 @@
 # by default, it will re-use the old pvc if already created (unless a pvc is provided)
 - name: Set PVC to use for backup
   set_fact:
-    backup_claim: "{{ backup_pvc | default(_default_backup_pvc, true) }}"
+    backup_pvc: "{{ backup_pvc | default(_default_backup_pvc, true) }}"
 
 - block:
     - name: Create PVC for backup
@@ -57,7 +57,7 @@
           apiVersion: v1
           kind: PersistentVolumeClaim
           metadata:
-            name: "{{ deployment_name }}-backup-claim"
+            name: "{{ backup_pvc }}"
             namespace: "{{ backup_pvc_namespace }}"
             ownerReferences: null
   when:
diff --git a/roles/backup/tasks/update_status.yml b/roles/backup/tasks/update_status.yml
index 8130a85d..d4b5764f 100644
--- a/roles/backup/tasks/update_status.yml
+++ b/roles/backup/tasks/update_status.yml
@@ -9,5 +9,5 @@
     namespace: "{{ ansible_operator_meta.namespace }}"
     status:
       backupDirectory: "{{ backup_dir }}"
-      backupClaim: "{{ backup_claim }}"
+      backupClaim: "{{ backup_pvc }}"
   when: backup_complete
diff --git a/roles/backup/templates/backup_pvc.yml.j2 b/roles/backup/templates/backup_pvc.yml.j2
index 3e4f7d2f..c13b76f7 100644
--- a/roles/backup/templates/backup_pvc.yml.j2
+++ b/roles/backup/templates/backup_pvc.yml.j2
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ deployment_name }}-backup-claim
+  name: {{ backup_pvc }}
   namespace: "{{ backup_pvc_namespace }}"
   ownerReferences: null
   labels:
diff --git a/roles/backup/templates/management-pod.yml.j2 b/roles/backup/templates/management-pod.yml.j2
index 0ec0cfbb..1c09dacb 100644
--- a/roles/backup/templates/management-pod.yml.j2
+++ b/roles/backup/templates/management-pod.yml.j2
@@ -27,6 +27,6 @@ spec:
   volumes:
     - name: {{ ansible_operator_meta.name }}-backup
       persistentVolumeClaim:
-        claimName: {{ backup_claim }}
+        claimName: {{ backup_pvc }}
         readOnly: false
   restartPolicy: Never