From e71ee0cc5f1d9ed1b8354a91914101b1b74a85e7 Mon Sep 17 00:00:00 2001 From: kayrus Date: Wed, 5 Jul 2023 17:23:16 +0200 Subject: [PATCH] Add support for OpenStack CSI drivers topology keys Signed-off-by: kayrus --- changelogs/unreleased/6464-openstack-csi-topology-keys | 1 + pkg/backup/item_backupper.go | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/6464-openstack-csi-topology-keys diff --git a/changelogs/unreleased/6464-openstack-csi-topology-keys b/changelogs/unreleased/6464-openstack-csi-topology-keys new file mode 100644 index 0000000000..d4c3c976c9 --- /dev/null +++ b/changelogs/unreleased/6464-openstack-csi-topology-keys @@ -0,0 +1 @@ +Add support for OpenStack CSI drivers topology keys diff --git a/pkg/backup/item_backupper.go b/pkg/backup/item_backupper.go index a9a3ae4400..d6cd5ba6b0 100644 --- a/pkg/backup/item_backupper.go +++ b/pkg/backup/item_backupper.go @@ -445,6 +445,10 @@ const ( azureCsiZoneKey = "topology.disk.csi.azure.com/zone" gkeCsiZoneKey = "topology.gke.io/zone" gkeZoneSeparator = "__" + + // OpenStack CSI drivers topology keys + cinderCsiZoneKey = "topology.manila.csi.openstack.org/zone" + manilaCsiZoneKey = "topology.cinder.csi.openstack.org/zone" ) // takePVSnapshot triggers a snapshot for the volume/disk underlying a PersistentVolume if the provided @@ -506,7 +510,7 @@ func (ib *itemBackupper) takePVSnapshot(obj runtime.Unstructured, log logrus.Fie if !labelFound { var k string log.Infof("label %q is not present on PersistentVolume", zoneLabelDeprecated) - k, pvFailureDomainZone = zoneFromPVNodeAffinity(pv, awsEbsCsiZoneKey, azureCsiZoneKey, gkeCsiZoneKey, zoneLabel, zoneLabelDeprecated) + k, pvFailureDomainZone = zoneFromPVNodeAffinity(pv, awsEbsCsiZoneKey, azureCsiZoneKey, gkeCsiZoneKey, cinderCsiZoneKey, manilaCsiZoneKey, zoneLabel, zoneLabelDeprecated) if pvFailureDomainZone != "" { log.Infof("zone info from nodeAffinity requirements: %s, key: %s", pvFailureDomainZone, k) } else {