github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Don't add empty AZ labels to OpenStack volumes

Browse Source
This commit is contained in:
Tomas Smetana 2020-09-30 11:02:36 +02:00
parent 604569482f
commit e9ca265901
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/legacy-cloud-providers/openstack/openstack_volumes.go
View File

@ -744,8 +744,12 @@ func (os *OpenStack) GetLabelsForVolume(ctx context.Context, pv *v1.PersistentVo
// Construct Volume Labels // Construct Volume Labels
labels := make(map[string]string) labels := make(map[string]string)
labels[v1.LabelZoneFailureDomain] = volume.AvailabilityZone if volume.AvailabilityZone != "" {
labels[v1.LabelZoneRegion] = os.region 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) klog.V(4).Infof("The Volume %s has labels %v", pv.Spec.Cinder.VolumeID, labels)
return labels, nil return labels, nil