[b/r] Rename backup labels to backup.openstack.org/ prefix in docs

Update all label references in docs/dev/backup-restore/ from
openstack.org/backup-* to backup.openstack.org/* prefix:
- backup.openstack.org/restore (was openstack.org/backup-restore)
- backup.openstack.org/category (was openstack.org/backup-category)
- backup.openstack.org/restore-order (was openstack.org/backup-restore-order)
- backup.openstack.org/backup (was openstack.org/backup)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: stuggi

docs/dev/backup-restore/backup-restore-controller-design.md

@@ -17,7 +17,7 @@ All repositories use a `backup_restore` branch for this work.
 1. **CRD labels** declare which types participate in backup/restore
 2. **OpenStackBackupConfig controller** labels CR instances and user-provided resources (Secrets, ConfigMaps, NADs)
 3. **Operators** label managed resources they create (PVCs, database password secrets)
-4. **OADP** backs up all resources, restores selectively using `openstack.org/backup-restore` labels
+4. **OADP** backs up all resources, restores selectively using `backup.openstack.org/restore` labels
 
 **Two Labeling Mechanisms:**
 
@@ -34,9 +34,9 @@ All repositories use a `backup_restore` branch for this work.
   - `backup.GetRestoreLabels()` for resource instance labels
   - `backup.BuildCRDLabelCache()` for CRD label cache
 - **Use label constants**: Always use constants from `backup` package for label keys
-  - `backup.BackupRestoreLabel` = `"openstack.org/backup-restore"`
-  - `backup.BackupCategoryLabel` = `"openstack.org/backup-category"`
-  - `backup.BackupRestoreOrderLabel` = `"openstack.org/backup-restore-order"`
+  - `backup.BackupRestoreLabel` = `"backup.openstack.org/restore"`
+  - `backup.BackupCategoryLabel` = `"backup.openstack.org/category"`
+  - `backup.BackupRestoreOrderLabel` = `"backup.openstack.org/restore-order"`
   - Never hardcode label strings
 - **Return maps, don't modify in-place**: Functions should return label/annotation maps, not modify objects directly
 - **Use CreateOrPatch pattern**: Operators typically use CreateOrPatch or CreateOrUpdate (not direct Create)
@@ -70,9 +70,9 @@ package backup
 
 const (
     // Label keys for CRD metadata (declare backup behavior for the type)
-    BackupRestoreLabel      = "openstack.org/backup-restore"       // CRD label: "true" means instances participate in backup/restore
-    BackupCategoryLabel     = "openstack.org/backup-category"      // CRD & instance label: "controlplane" or "dataplane"
-    BackupRestoreOrderLabel = "openstack.org/backup-restore-order" // CRD & instance label: "00"-"60"
+    BackupRestoreLabel      = "backup.openstack.org/restore"       // CRD label: "true" means instances participate in backup/restore
+    BackupCategoryLabel     = "backup.openstack.org/category"      // CRD & instance label: "controlplane" or "dataplane"
+    BackupRestoreOrderLabel = "backup.openstack.org/restore-order" // CRD & instance label: "00"-"60"
 )
 
 // GetRestoreLabels returns a map with backup/restore labels for CR instances
@@ -132,9 +132,9 @@ func BuildCRDLabelCache(ctx context.Context, c client.Client) (CRDLabelCache, er
 Add labels to CRD metadata using kubebuilder annotations on Go type definitions:
 
 ```go
-// +kubebuilder:metadata:labels=openstack.org/backup-restore=true
-// +kubebuilder:metadata:labels=openstack.org/backup-category=controlplane
-// +kubebuilder:metadata:labels=openstack.org/backup-restore-order=30
+// +kubebuilder:metadata:labels=backup.openstack.org/restore=true
+// +kubebuilder:metadata:labels=backup.openstack.org/category=controlplane
+// +kubebuilder:metadata:labels=backup.openstack.org/restore-order=30
 type OpenStackControlPlane struct {
 ```
 
@@ -204,14 +204,14 @@ After modifying type definitions, run `make generate manifests` to update genera
 
 ```bash
 # List all CRDs with backup-restore labels
-oc get crd -l openstack.org/backup-restore=true
+oc get crd -l backup.openstack.org/restore=true
 
 # Check specific CRD
 oc get crd openstackcontrolplanes.core.openstack.org -o jsonpath='{.metadata.labels}'
 
 # Filter by category
-oc get crd -l openstack.org/backup-restore=true -l openstack.org/backup-category=controlplane
-oc get crd -l openstack.org/backup-restore=true -l openstack.org/backup-category=dataplane
+oc get crd -l backup.openstack.org/restore=true -l backup.openstack.org/category=controlplane
+oc get crd -l backup.openstack.org/restore=true -l backup.openstack.org/category=dataplane
 ```
 
 ## Phase 3: OpenStackBackupConfig Controller
@@ -353,13 +353,13 @@ MariaDB operator labels database password secrets with restore order 10.
 
 We use two separate OADP backups:
 
-1. **backup-openstack-pvcs** - Contains ONLY PVCs with `openstack.org/backup: "true"` label
+1. **backup-openstack-pvcs** - Contains ONLY PVCs with `backup.openstack.org/backup: "true"` label
    - Filtering done at backup time via labelSelector
    - Uses CSI volume snapshots
 
 2. **backup-openstack-resources** - Contains everything EXCEPT PVCs
    - No filtering at backup time (backs up all resources)
-   - Restore uses labelSelector to filter by `openstack.org/backup-restore-order`
+   - Restore uses labelSelector to filter by `backup.openstack.org/restore-order`
 
 ### Restore Order Summary
 
@@ -393,8 +393,8 @@ spec:
   - openstack
   labelSelector:
     matchLabels:
-      openstack.org/backup-restore: "true"
-      openstack.org/backup-restore-order: "20"
+      backup.openstack.org/restore: "true"
+      backup.openstack.org/restore-order: "20"
   resourceModifier:
     kind: ConfigMap
     name: openstack-restore-resource-modifiers
@@ -428,7 +428,7 @@ ansible-playbook docs/dev/backup-restore/restore/restore-openstack.yaml \
 
 ```bash
 # List all CRDs with backup-restore labels
-oc get crd -l openstack.org/backup-restore=true
+oc get crd -l backup.openstack.org/restore=true
 
 # Verify specific CRD labels
 oc get crd openstackcontrolplanes.core.openstack.org -o jsonpath='{.metadata.labels}'
@@ -452,10 +452,10 @@ EOF
 oc get openstackbackupconfig backup-config -n openstack
 
 # Verify user-provided secrets are labeled
-oc get secret -l openstack.org/backup-restore=true -n openstack
+oc get secret -l backup.openstack.org/restore=true -n openstack
 
 # Verify CR instances are labeled
-oc get openstackcontrolplane -l openstack.org/backup-restore=true -n openstack
+oc get openstackcontrolplane -l backup.openstack.org/restore=true -n openstack
 ```
 
 ### Backup Testing
@@ -500,7 +500,7 @@ oc wait --for=jsonpath='{.status.phase}'=Completed restore/openstack-restore-00-
 
 ### CRD Label Cache Issues
 
-- Verify CRD labels: `oc get crd -l openstack.org/backup-restore=true`
+- Verify CRD labels: `oc get crd -l backup.openstack.org/restore=true`
 - Cache is built lazily on first reconciliation; restart operator to rebuild
 - After `make generate manifests`, apply updated CRDs: `oc apply -f config/crd/bases/`
 

docs/dev/backup-restore/backup-restore-controller-implementation.md

@@ -8,7 +8,7 @@ Enhance the backup/restore system to serialize OpenStack CRs, Secrets, and Confi
 
 The POC implementation uses a two-backup approach:
 
-1. **openstack-backup-pvcs**: CSI snapshots of PVCs labeled with `openstack.org/backup: "true"`
+1. **openstack-backup-pvcs**: CSI snapshots of PVCs labeled with `backup.openstack.org/backup: "true"`
    - Glance image storage PVCs
    - MariaDB GaleraBackup PVCs
 
@@ -53,7 +53,7 @@ Replace the Velero object storage backup of resources with a backup controller t
 │         │                          /metadata.json             │
 │         │                                                     │
 │         └──> Labels backup PVC with                          │
-│              openstack.org/backup: "true"                    │
+│              backup.openstack.org/backup: "true"                    │
 │                                                               │
 │  OADP Backup (single)                                        │
 │         └──> CSI snapshots of ALL labeled PVCs               │
@@ -385,7 +385,7 @@ spec:
   # Only backup labeled PVCs
   labelSelector:
     matchLabels:
-      openstack.org/backup: "true"
+      backup.openstack.org/backup: "true"
 
   # Use CSI snapshots for all PVCs
   snapshotVolumes: true
@@ -439,7 +439,7 @@ spec:
 ### Backup PVC Lifecycle
 
 - PVC should be created by backup controller
-- Labeled with `openstack.org/backup: "true"` to be included in OADP backup
+- Labeled with `backup.openstack.org/backup: "true"` to be included in OADP backup
 - Should persist between backups (accumulate backup history)
 - Cleanup policy: keep last N backups, or retention period
 

docs/dev/backup-restore/backup-restore-pvc-enhancement.md

@@ -8,7 +8,7 @@ We use a two-backup strategy:
 
 1. **backup-openstack-pvcs.yaml** - PVCs only (with CSI snapshots, local only)
    - Filters at backup time using `labelSelector`
-   - Only includes PVCs labeled with `openstack.org/backup: "true"`
+   - Only includes PVCs labeled with `backup.openstack.org/backup: "true"`
    - Includes: Glance image storage PVCs, GaleraBackup PVCs
 
 1. **backup-openstack-pvcs-datamover.yaml** - PVCs with Data Mover (uploads to S3/MinIO)
@@ -47,7 +47,7 @@ ansible-playbook docs/dev/backup-restore/backup/backup-openstack.yaml
 
 The playbook runs three steps:
 1. **Trigger Galera DB dumps** — creates jobs from GaleraBackup cronjobs
-2. **OADP PVC backup** — CSI snapshots of PVCs labeled with `openstack.org/backup=true`
+2. **OADP PVC backup** — CSI snapshots of PVCs labeled with `backup.openstack.org/backup=true`
 3. **OADP resources backup** — all resources in the namespace except PVCs
 
 PVC backup labels are set automatically by service operators (glance-operator, mariadb-operator).
@@ -89,7 +89,7 @@ oc describe backup openstack-backup-pvcs -n openshift-adp
 
 - Glance local PVCs (image storage)
 - GaleraBackup PVCs (database backups)
-- Any other PVCs labeled with `openstack.org/backup: "true"`
+- Any other PVCs labeled with `backup.openstack.org/backup: "true"`
 
 ### backup-openstack-resources
 

docs/dev/backup-restore/backup/README.md

@@ -1,6 +1,6 @@
 ---
 # OpenStack PVC Backup with Data Mover
-# Backs up PVCs labeled with openstack.org/backup=true and uploads
+# Backs up PVCs labeled with backup.openstack.org/backup=true and uploads
 # CSI snapshot data to the BackupStorageLocation (S3/MinIO) via Kopia.
 # This allows restore even after total cluster loss.
 #
@@ -23,7 +23,7 @@ spec:
   # For PVCs, Velero automatically includes their bound PVs
   labelSelector:
     matchLabels:
-      openstack.org/backup: "true"
+      backup.openstack.org/backup: "true"
 
   # Use CSI snapshots for PVCs
   snapshotVolumes: true

docs/dev/backup-restore/backup/backup-openstack-pvcs-datamover.yaml

@@ -1,6 +1,6 @@
 ---
 # OpenStack PVC Backup
-# Backs up only PVCs (and their bound PVs) labeled with openstack.org/backup=true
+# Backs up only PVCs (and their bound PVs) labeled with backup.openstack.org/backup=true
 # These include: Glance image storage PVCs, GaleraBackup PVCs
 #
 # Note: Velero automatically includes the PV bound to each PVC - no need to label PVs
@@ -17,7 +17,7 @@ spec:
   # For PVCs, Velero automatically includes their bound PVs
   labelSelector:
     matchLabels:
-      openstack.org/backup: "true"
+      backup.openstack.org/backup: "true"
 
   # Use CSI snapshots for PVCs
   snapshotVolumes: true

docs/dev/backup-restore/backup/backup-openstack-pvcs.yaml

@@ -6,7 +6,7 @@
 # 2. OADP PVC backup (CSI snapshots of labeled PVCs)
 # 3. OADP resources backup (CRs, Secrets, ConfigMaps, NADs, etc.)
 #
-# PVC backup labels (openstack.org/backup=true) are set automatically
+# PVC backup labels (backup.openstack.org/backup=true) are set automatically
 # by the service operators (glance-operator, mariadb-operator, etc.).
 #
 # Prerequisites:
@@ -108,7 +108,7 @@
 
     - name: List PVCs marked for backup
       ansible.builtin.shell: |
-        oc get pvc -n {{ openstack_namespace }} -l openstack.org/backup=true \
+        oc get pvc -n {{ openstack_namespace }} -l backup.openstack.org/backup=true \
           -o custom-columns=NAME:.metadata.name,SIZE:.spec.resources.requests.storage,SERVICE:.metadata.labels.service --no-headers
       register: labeled_pvcs
       changed_when: false
@@ -121,7 +121,7 @@
 
     - name: Warn if no PVCs labeled
       ansible.builtin.debug:
-        msg: "WARNING: No PVCs found with openstack.org/backup=true label"
+        msg: "WARNING: No PVCs found with backup.openstack.org/backup=true label"
       when: labeled_pvcs.stdout_lines | default([]) | length == 0
 
     - name: Create OADP PVC backup
@@ -137,7 +137,7 @@
           - {{ openstack_namespace }}
           labelSelector:
             matchLabels:
-              openstack.org/backup: "true"
+              backup.openstack.org/backup: "true"
           snapshotVolumes: true
           snapshotMoveData: {{ snapshot_move_data | lower }}
           defaultVolumesToFsBackup: false

docs/dev/backup-restore/backup/backup-openstack.yaml

@@ -1034,7 +1034,7 @@ Node worker-5:  # Different node!
 
 All your work is used:
 - ✅ CRD labels → Velero uses these to identify resources
-- ✅ PVC labels (`openstack.org/backup: "true"`) → Identifies which PVCs to snapshot
+- ✅ PVC labels (`backup.openstack.org/backup: "true"`) → Identifies which PVCs to snapshot
 - ✅ CR instance labels → Used for restore ordering
 - ✅ Backup/Restore CRs → Just add `snapshotMoveData: true`
 
@@ -1295,7 +1295,7 @@ spec:
 
   labelSelector:
     matchLabels:
-      openstack.org/backup: "true"
+      backup.openstack.org/backup: "true"
 
   snapshotVolumes: true  # ← Already have this
 
@@ -1314,7 +1314,7 @@ spec:
 
   labelSelector:
     matchLabels:
-      openstack.org/backup: "true"
+      backup.openstack.org/backup: "true"
 
   snapshotVolumes: true
   snapshotMoveData: true  # ← ADD THIS LINE for DR!
@@ -1573,7 +1573,7 @@ spec:
   # Only backup labeled resources
   labelSelector:
     matchLabels:
-      openstack.org/backup-restore: "true"
+      backup.openstack.org/restore: "true"
 
   # Backup PVCs to object storage
   defaultVolumesToFsBackup: true
@@ -1619,7 +1619,7 @@ spec:
 
   labelSelector:
     matchLabels:
-      openstack.org/backup: "true"
+      backup.openstack.org/backup: "true"
 
   # Use Restic instead of CSI snapshots
   defaultVolumesToFsBackup: true
@@ -1882,8 +1882,8 @@ spec:
 
   labelSelector:
     matchLabels:
-      openstack.org/backup-restore: "true"
-      openstack.org/backup-restore-order: "10"
+      backup.openstack.org/restore: "true"
+      backup.openstack.org/restore-order: "10"
 
   resourceModifier:
     kind: ConfigMap
@@ -2034,8 +2034,8 @@ spec:
 
   labelSelector:
     matchLabels:
-      openstack.org/backup-restore: "true"
-      openstack.org/backup-restore-order: "60"
+      backup.openstack.org/restore: "true"
+      backup.openstack.org/restore-order: "60"
 
   resourceModifier:
     kind: ConfigMap

docs/dev/backup-restore/disaster-recovery-guide.md

@@ -4,7 +4,7 @@
 # Must be restored first before other resources
 #
 # Note: No labelSelector needed - the backup (openstack-backup-pvcs) already
-# filtered to only include PVCs with openstack.org/backup=true label.
+# filtered to only include PVCs with backup.openstack.org/backup=true label.
 #
 # Prerequisite: Create the resource modifier ConfigMap first:
 #   oc apply -f 00-resource-modifiers-configmap.yaml

docs/dev/backup-restore/restore/01-restore-order-00-pvcs.yaml

@@ -20,8 +20,8 @@ spec:
   # Only restore resources with backup-restore label and order 10
   labelSelector:
     matchLabels:
-      openstack.org/backup-restore: "true"
-      openstack.org/backup-restore-order: "10"
+      backup.openstack.org/restore: "true"
+      backup.openstack.org/restore-order: "10"
 
   # Remove last-applied-configuration via ConfigMap-based resource modifiers
   resourceModifier: