[b/r] Add backup-restore CRD labels to DataPlaneService

Add backup-restore labels to OpenStackDataPlaneService CRD
(order 40, dataplane). Custom user-created services need to be
restored before DataPlaneNodeSet (order 60). Default services
shipped in config/services/ are recreated by the NodeSet controller
via EnsureServices/CreateOrPatch.

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

Author: stuggi

api/bases/dataplane.openstack.org_openstackdataplaneservices.yaml

@@ -4,6 +4,10 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.18.0
+  labels:
+    openstack.org/backup-category: dataplane
+    openstack.org/backup-restore: "true"
+    openstack.org/backup-restore-order: "40"
   name: openstackdataplaneservices.dataplane.openstack.org
 spec:
   group: dataplane.openstack.org

api/dataplane/v1beta1/openstackdataplaneservice_types.go

@@ -130,6 +130,9 @@ type OpenStackDataPlaneServiceStatus struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:shortName=osdps;osdpservice;osdpservices
 // +operator-sdk:csv:customresourcedefinitions:displayName="OpenStack Data Plane Service"
+// +kubebuilder:metadata:labels=openstack.org/backup-restore=true
+// +kubebuilder:metadata:labels=openstack.org/backup-category=dataplane
+// +kubebuilder:metadata:labels=openstack.org/backup-restore-order=40
 
 // OpenStackDataPlaneService defines the Schema for the openstackdataplaneservices API.
 // OpenStackDataPlaneService name must be a valid RFC1123 as it is used in labels

config/crd/bases/dataplane.openstack.org_openstackdataplaneservices.yaml

@@ -4,6 +4,10 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.18.0
+  labels:
+    openstack.org/backup-category: dataplane
+    openstack.org/backup-restore: "true"
+    openstack.org/backup-restore-order: "40"
   name: openstackdataplaneservices.dataplane.openstack.org
 spec:
   group: dataplane.openstack.org

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

@@ -90,7 +90,7 @@ const (
     RestoreOrder10 = "10" // Foundation - NADs, Secrets, ConfigMaps
     RestoreOrder20 = "20" // Infrastructure - Issuers, MariaDB, NetConfig, Topology, BGPConfiguration, DNSData, OpenStackVersion, OpenStackBackupConfig
     RestoreOrder30 = "30" // CtlPlane + networking - OpenStackControlPlane, Reservation
-    RestoreOrder40 = "40" // Backup config & IP sets - GaleraBackup, IPSet
+    RestoreOrder40 = "40" // Backup config, IP sets, DataPlane services - GaleraBackup, IPSet, DataPlaneService
     RestoreOrder50 = "50" // Manual steps - database/RabbitMQ restore, resume deployment
     RestoreOrder60 = "60" // DataPlane - DataPlaneNodeSet
 )
@@ -154,6 +154,10 @@ After modifying type definitions, run `make generate manifests` to update genera
 4. **OpenStackBackupConfig** (`api/backup/v1beta1/openstackbackupconfig_types.go`)
    - `backup-restore=true`, `category=controlplane`, `order=20`
 
+5. **OpenStackDataPlaneService** (`api/dataplane/v1beta1/openstackdataplaneservice_types.go`)
+   - `backup-restore=true`, `category=dataplane`, `order=40`
+   - Custom user-created services; default services are recreated by NodeSet controller
+
 ### MariaDB Operator CRDs
 
 1. **MariaDBAccount** (`api/v1beta1/mariadbaccount_types.go`)
@@ -365,7 +369,7 @@ We use two separate OADP backups:
 | 10 | Secrets, ConfigMaps, NADs | OADP Restore CR | User-provided resources |
 | 20 | OpenStackVersion, OpenStackBackupConfig, MariaDBAccount, MariaDBDatabase, NetConfig, Topology, BGPConfiguration, DNSData, InstanceHa | OADP Restore CR | Infrastructure base (InstanceHa restored with `spec.disabled: True`) |
 | 30 | OpenStackControlPlane, Reservation | OADP Restore CR | With `deployment-stage: infrastructure-only` annotation |
-| 40 | GaleraBackup, IPSet | OADP Restore CR | Backup config, IP sets |
+| 40 | GaleraBackup, IPSet, DataPlaneService | OADP Restore CR | Backup config, IP sets, custom DataPlane services |
 | 50 | Database + RabbitMQ restore | **Manual/Playbook** | GaleraRestore CRs, RabbitMQ credential restore, remove staged annotation |
 | 60 | DataPlaneNodeSet | OADP Restore CR | DataPlane resources (optional) |
 

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

@@ -109,9 +109,10 @@ oc describe backup openstack-backup-pvcs -n openshift-adp
 - OpenStackControlPlane
 - Reservation
 
-**Order 40 - Backup Config & IP Sets:**
+**Order 40 - Backup Config, IP Sets & DataPlane Services:**
 - GaleraBackup
 - IPSet
+- DataPlaneService (custom user-created services)
 
 **Order 60 - DataPlane:**
 - OpenStackDataPlaneNodeSet

docs/dev/backup-restore/restore/05-restore-order-40-backup-config.yaml

@@ -1,7 +1,9 @@
 ---
-# Restore Order 40: Backup Configuration
-# Restores GaleraBackup and other backup-related configuration CRs
+# Restore Order 40: Backup Configuration, IP Sets & DataPlane Services
+# Restores GaleraBackup, IPSet, and DataPlaneService CRs
 # Must be restored after OpenStackControlPlane (order 30)
+# DataPlaneService: Custom user-created services are restored here;
+# default services are recreated by the NodeSet controller
 #
 # Prerequisite: Create the resource modifier ConfigMap first:
 #   oc apply -f 00-resource-modifiers-configmap.yaml

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

@@ -13,7 +13,7 @@ Restores must be executed in sequence. Wait for each restore to complete before
 | `02-restore-order-10-foundation.yaml` | 10 | Secrets, ConfigMaps, NADs | User-provided resources without ownerRefs |
 | `03-restore-order-20-infrastructure.yaml` | 20 | OpenStackVersion, OpenStackBackupConfig, MariaDBAccount, MariaDBDatabase, NetConfig, Topology, BGPConfiguration, DNSData, InstanceHa | Infrastructure base (**InstanceHa restored with `spec.disabled: True`**) |
 | `04-restore-order-30-controlplane.yaml` | 30 | OpenStackControlPlane, Reservation | **Adds `deployment-stage: infrastructure-only` annotation** |
-| `05-restore-order-40-backup-config.yaml` | 40 | GaleraBackup, IPSet | Backup configuration CRs and IP sets |
+| `05-restore-order-40-backup-config.yaml` | 40 | GaleraBackup, IPSet, DataPlaneService | Backup config, IP sets, custom DataPlane services |
 | `06-manual-database-restore.md` | 50 | **Manual** | Create GaleraRestore CRs, run restore script |
 | `06b-restore-rabbitmq-secrets.yaml` | - | Secrets (to temp ns) | Restore secrets to `openstack-restore-tmp`, copy `*-default-user` as `*-restored-user`, create RabbitMQUser CRs |
 | *(Step 9 in playbook)* | - | **Manual** | Remove deployment-stage annotation, wait for control plane ready |