[DZ-Storage] Adding cinderBackups to controlplane

[gais-ameer-rh]

To deploy multiple cinder backups based on AZ topology

Removes the existing spec.cinder.template.cinderBackup (singluar)
and replaces with cinderBackups (plural)

Jira: OSPRH-28342
Signed-off-by: Gais Ameer gameer@redhat.com

Depends-On: openstack-k8s-operators/ci-framework#3927

[openshift-ci]

Hi @gais-ameer-rh. Thanks for your PR.

I'm waiting for a openstack-k8s-operators member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[fultonj]

Thanks Gais.

Overall looks good. There's a few small changes I would like.

There are two duplicate commits (b5f6ccc and 2436c3a) with very similar messages. Please use git squash so turn them into one commit.

https://github.com/openstack-k8s-operators/architecture/pull/760/commits

Thanks

[fultonj]

The expected change in the oscp is produced.

$ diff -u /tmp/cr-review/before.yaml /tmp/cr-review/after.yaml                                                                                                                                        
--- /tmp/cr-review/before.yaml  2026-05-15 14:54:48.290074926 -0400                                                                                                                                                                                            
+++ /tmp/cr-review/after.yaml   2026-05-15 14:54:57.735261671 -0400
@@ -204,14 +204,52 @@
                 type: LoadBalancer
         replicas: 3
       cinderBackup:
-        customServiceConfig: |
-          [DEFAULT]
-          # Not implemented in this example
         networkAttachments:
         - storage
         replicas: 0
-        topologyRef:
-          name: azone-node-affinity
+      cinderBackups:
+        cinder-backup-az0:
+          customServiceConfig: |
+            [DEFAULT]
+            backup_share = _replaced_
+            backup_driver = cinder.backup.drivers.nfs.NFSBackupDriver
+            backup_mount_point_base = /var/lib/cinder/backup
+            storage_availability_zone = az0
+          customServiceConfigSecrets:
+          - cinder-volume-secrets-az0
+          networkAttachments:
+          - storage
+          replicas: 2
+          topologyRef:
+            name: azone-node-affinity
+        cinder-backup-az1:
+          customServiceConfig: |
+            [DEFAULT]
+            backup_share = _replaced_
+            backup_driver = cinder.backup.drivers.nfs.NFSBackupDriver
+            backup_mount_point_base = /var/lib/cinder/backup
+            storage_availability_zone = az1
+          customServiceConfigSecrets:
+          - cinder-volume-secrets-az1
+          networkAttachments:
+          - storage
+          replicas: 2
+          topologyRef:
+            name: bzone-node-affinity
+        cinder-backup-az2:
+          customServiceConfig: |
+            [DEFAULT]
+            backup_share = _replaced_
+            backup_driver = cinder.backup.drivers.nfs.NFSBackupDriver
+            backup_mount_point_base = /var/lib/cinder/backup
+            storage_availability_zone = az2
+          customServiceConfigSecrets:
+          - cinder-volume-secrets-az2
+          networkAttachments:
+          - storage
+          replicas: 2
+          topologyRef:
+            name: czone-node-affinity
       cinderScheduler:
         replicas: 1
       cinderVolumes:
$ 

requested change was made

[fultonj]

Overall this /lgtm Let's confirm we get a green test project before merging.

[gais-ameer-rh]

The changes passed in a test project

[abays]

/lgtm

We just need openstack-k8s-operators/ci-framework#3927 to merge first before we merge this.

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: gais-ameer-rh
Once this PR has been reviewed and has the lgtm label, please ask for approval from abays. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[fultonj]

/lgtm

Let's get this merged first openstack-k8s-operators/ci-framework#3927