From e9ca26590147fc4a5b37607bcda819e6b38e099e Mon Sep 17 00:00:00 2001
From: Tomas Smetana <tsmetana@redhat.com>
Date: Wed, 30 Sep 2020 11:02:36 +0200
Subject: [PATCH] Don't add empty AZ labels to OpenStack volumes

---
 .../legacy-cloud-providers/openstack/openstack_volumes.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/staging/src/k8s.io/legacy-cloud-providers/openstack/openstack_volumes.go b/staging/src/k8s.io/legacy-cloud-providers/openstack/openstack_volumes.go
index 4b72a5b0339..b2214ceb791 100644
--- a/staging/src/k8s.io/legacy-cloud-providers/openstack/openstack_volumes.go
+++ b/staging/src/k8s.io/legacy-cloud-providers/openstack/openstack_volumes.go
@@ -744,8 +744,12 @@ func (os *OpenStack) GetLabelsForVolume(ctx context.Context, pv *v1.PersistentVo
 
 	// Construct Volume Labels
 	labels := make(map[string]string)
-	labels[v1.LabelZoneFailureDomain] = volume.AvailabilityZone
-	labels[v1.LabelZoneRegion] = os.region
+	if volume.AvailabilityZone != "" {
+		labels[v1.LabelZoneFailureDomain] = volume.AvailabilityZone
+	}
+	if os.region != "" {
+		labels[v1.LabelZoneRegion] = os.region
+	}
 	klog.V(4).Infof("The Volume %s has labels %v", pv.Spec.Cinder.VolumeID, labels)
 
 	return labels, nil