github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #95174 from tsmetana/fix-openstack-pvlabeler-zone

Browse Source 
Don't add empty AZ labels to OpenStack pre-provisioned PVs
This commit is contained in:
Kubernetes Prow Robot 2020-11-03 21:52:03 -08:00 committed by GitHub
commit ced9d07478
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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)
if volume.AvailabilityZone != "" {
labels[v1.LabelZoneFailureDomain] = volume.AvailabilityZone labels[v1.LabelZoneFailureDomain] = volume.AvailabilityZone
}
if os.region != "" {
labels[v1.LabelZoneRegion] = 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