Skip to content

Commit e5666cf

Browse files
Fedosink8s-publishing-bot
authored andcommitted
Bug 1822667: UPSTREAM: 88424: Respect ignore-volume-az option in admission plugin
Cherry-pick of kubernetes#88424 Origin-commit: 099d68296da64ecaeaed6e7e818f9d6436ce2cb8
1 parent 97561f4 commit e5666cf

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

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

+5
Original file line numberDiff line numberDiff line change
@@ -726,6 +726,11 @@ func (os *OpenStack) GetLabelsForVolume(ctx context.Context, pv *v1.PersistentVo
726726
return nil, nil
727727
}
728728

729+
// if volume az is to be ignored we should return nil from here
730+
if os.bsOpts.IgnoreVolumeAZ {
731+
return nil, nil
732+
}
733+
729734
// Get metadata
730735
md, err := getMetadata(os.metadataOpts.SearchOrder)
731736
if err != nil {

0 commit comments

Comments
 (0)