Skip to content

Commit 949bf65

Browse files
stuggiclaude
andcommitted
Fix annotation naming consistency in webhook design
- Changed all examples in Phase 2 and Phase 3 to use correct annotation names - Fixed: openstack.org/backup → openstack.org/backup-restore - Fixed: openstack.org/restore-order → openstack.org/backup-restore-order - Updated Phase 2 backup example to show full namespace backup (no label selector) - Fixed all table headers from "Backup" to "Restore" for consistency - Updated PVC label reference to use openstack.org/backup-restore All annotations now consistently use the openstack.org/backup- prefix. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
1 parent 3bf4b0c commit 949bf65

1 file changed

Lines changed: 17 additions & 19 deletions

File tree

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

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ The restore sequence is critical for maintaining dependencies between resources.
279279

280280
### Infrastructure Operator CRDs
281281

282-
| CRD | Backup | Category | Order | Notes |
283-
|-----|--------|----------|-------|-------|
282+
| CRD | Restore | Category | Order | Notes |
283+
|-----|---------|----------|-------|-------|
284284
| NetConfig | true | infrastructure | 5 | Network configuration |
285285
| IPSet | true | infrastructure | 5 | IP address sets |
286286
| Reservation | true | infrastructure | 5 | IP reservations |
@@ -295,33 +295,33 @@ The restore sequence is critical for maintaining dependencies between resources.
295295

296296
### MariaDB Operator CRDs
297297

298-
| CRD | Backup | Category | Order | Notes |
299-
|-----|--------|----------|-------|-------|
298+
| CRD | Restore | Category | Order | Notes |
299+
|-----|---------|----------|-------|-------|
300300
| MariaDBDatabase | true | controlplane | 3 | Database definitions |
301301
| MariaDBAccount | true | controlplane | 4 | Database accounts |
302302
| GaleraBackup | true | controlplane | 9 | Backup configuration |
303303

304304
### Data Plane CRDs
305305

306-
| CRD | Backup | Category | Order | Notes |
307-
|-----|--------|----------|-------|-------|
306+
| CRD | Restore | Category | Order | Notes |
307+
|-----|---------|----------|-------|-------|
308308
| OpenStackDataPlaneNodeSet | true | dataplane | 5 | Node set definitions |
309309
| OpenStackDataPlaneService* | true | dataplane | 5 | Custom services only |
310310

311311
*Only for user-created services (no ownerReferences)
312312

313313
### Kubernetes Core Resources
314314

315-
| Resource | Backup | Category | Order | Notes |
316-
|----------|--------|----------|-------|-------|
315+
| Resource | Restore | Category | Order | Notes |
316+
|----------|---------|----------|-------|-------|
317317
| Secret* | true | all | 1 | User-provided only (no ownerReferences) |
318318
| ConfigMap* | true | all | 1 | User-provided only (no ownerReferences) |
319319
| NetworkAttachmentDefinition | true | all | 1 | Network attachments |
320320
| Issuer (cert-manager) | true | all | 2 | TLS certificate issuers |
321321
| PersistentVolumeClaim** | true | all | 8 | Service storage volumes |
322322

323323
*Only resources without ownerReferences
324-
**Only PVCs with label `openstack.org/backup: "true"`
324+
**Only PVCs with label `openstack.org/backup-restore: "true"`
325325

326326
## Backup Categories
327327

@@ -383,7 +383,7 @@ oc create secret generic test-secret --from-literal=foo=bar -n openstack
383383
384384
# Verify label was added
385385
oc get secret test-secret -n openstack -o jsonpath='{.metadata.labels}'
386-
# Should show: openstack.org/backup: "true", openstack.org/restore-order: "1"
386+
# Should show: openstack.org/backup-restore: "true", openstack.org/backup-restore-order: "1"
387387
```
388388

389389
### Phase 2: OADP Backup (No Controller)
@@ -409,9 +409,7 @@ metadata:
409409
spec:
410410
includedNamespaces:
411411
- openstack
412-
labelSelector:
413-
matchLabels:
414-
openstack.org/backup: "true"
412+
# NO labelSelector - backup everything
415413
snapshotVolumes: true
416414
defaultVolumesToFsBackup: false
417415
storageLocation: velero-1
@@ -447,8 +445,8 @@ spec:
447445
backupName: openstack-backup-20260303-120000
448446
labelSelector:
449447
matchLabels:
450-
openstack.org/backup: "true"
451-
openstack.org/restore-order: "1"
448+
openstack.org/backup-restore: "true"
449+
openstack.org/backup-restore-order: "1"
452450
restorePVs: false
453451
EOF
454452
@@ -467,8 +465,8 @@ spec:
467465
backupName: openstack-backup-20260303-120000
468466
labelSelector:
469467
matchLabels:
470-
openstack.org/backup: "true"
471-
openstack.org/restore-order: "2"
468+
openstack.org/backup-restore: "true"
469+
openstack.org/backup-restore-order: "2"
472470
restorePVs: false
473471
EOF
474472
@@ -489,8 +487,8 @@ spec:
489487
backupName: openstack-backup-20260303-120000
490488
labelSelector:
491489
matchLabels:
492-
openstack.org/backup: "true"
493-
openstack.org/restore-order: "6"
490+
openstack.org/backup-restore: "true"
491+
openstack.org/backup-restore-order: "6"
494492
restorePVs: false
495493
EOF
496494

0 commit comments

Comments
 (0)