Commit 17758a6
Simplify restore order structure with PVCs first
Consolidate restore orders from 12 steps to 7 phases by grouping related
resources together. Move PVCs to order 00 (storage foundation) so backup
data is available for database restore.
New simplified restore order:
- Order 00: PVCs (storage foundation - Galera backups, Glance, Cinder, etc)
- Order 10: Foundation (NADs, Secrets, ConfigMaps)
- Order 20: TLS & Infrastructure (Issuers, MariaDB CRs, NetConfig, Topology, etc)
- Order 30: CtlPlane + Networking (OpenStackControlPlane with staged annotation, Reservation, IPSet)
- Order 40: Backup Config & User Resources (GaleraBackup, user-created RabbitMQUser/Vhost, DataPlaneService)
- Order 50: Manual/Controller Steps (database restore, RabbitMQ credentials, resume deployment)
- Order 60: Data Plane (DataPlaneNodeSet)
Key improvements:
- **PVCs first (order 00)**: Backup data available early for database restore in order 50
- **Fewer OADP restores**: 5 instead of 9 (orders 00, 10, 20, 30, 40)
- **Clearer dependencies**: NetConfig in order 20 before Reservation/IPSet in order 30
- **RabbitMQ clarification**:
- Order 10: Backed-up secrets restored (including *-default-user with old passwords)
- Order 40: User-created RabbitMQUser CRs restored
- Order 50: Create NEW *-restored-user secrets/CRs with old passwords (operator-managed)
- **Consolidated manual steps**: Order 50 handles database, RabbitMQ, and resume in sequence
- **Better grouping**: Related resources restored together (e.g., all infrastructure in order 20)
Updated throughout:
- Main restore order table with detailed notes
- All CRD annotation mapping tables
- Kubernetes core resources table
- Phase 3 manual restore examples
- Phase 4 controller logic
- Code examples (webhooks, operators)
- OpenStackBackupConfig examples
- Annotation descriptions
Benefits for automation:
- Controller can execute order 50 steps sequentially
- PVCs available from start for database restore pods
- Fewer OADP Restore CRs to manage
- Clearer phase boundaries
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>1 parent 1a7ab01 commit 17758a6
1 file changed
Lines changed: 151 additions & 76 deletions
0 commit comments