From a1e08f4eecbabcf03dbf4ac5aacfdd890803cd6a 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/6488-kayrus | 1 + pkg/backup/item_backupper.go | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/6488-kayrus diff --git a/changelogs/unreleased/6488-kayrus b/changelogs/unreleased/6488-kayrus new file mode 100644 index 000000000..d4c3c976c --- /dev/null +++ b/changelogs/unreleased/6488-kayrus @@ -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 1dec2b3c2..2e1378f0d 100644 --- a/pkg/backup/item_backupper.go +++ b/pkg/backup/item_backupper.go @@ -448,6 +448,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 @@ -502,7 +506,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 {