diff --git a/pkg/controller/volume/persistentvolume/index.go b/pkg/controller/volume/persistentvolume/index.go index 3b095e0be76..e0f9f1159ea 100644 --- a/pkg/controller/volume/persistentvolume/index.go +++ b/pkg/controller/volume/persistentvolume/index.go @@ -118,9 +118,14 @@ func (pvIndex *persistentVolumeOrderedIndex) findByClaim(claim *api.PersistentVo // the claim. for _, volume := range volumes { if isVolumeBoundToClaim(volume, claim) { - // this claim and volume are bound; return it, - // whether the claim is prebound or for volumes - // intended for dynamic provisioning v1 + // this claim and volume are pre-bound; return + // the volume if the size request is satisfied, + // otherwise continue searching for a match + volumeQty := volume.Spec.Capacity[api.ResourceStorage] + volumeSize := volumeQty.Value() + if volumeSize < requestedSize { + continue + } return volume, nil } diff --git a/pkg/controller/volume/persistentvolume/index_test.go b/pkg/controller/volume/persistentvolume/index_test.go index f233b7fe348..a1844c667e4 100644 --- a/pkg/controller/volume/persistentvolume/index_test.go +++ b/pkg/controller/volume/persistentvolume/index_test.go @@ -718,11 +718,16 @@ func TestFindingPreboundVolumes(t *testing.T) { pv1 := testVolume("pv1", "1Gi") pv5 := testVolume("pv5", "5Gi") pv8 := testVolume("pv8", "8Gi") + pvBadSize := testVolume("pvBadSize", "1Mi") + pvBadMode := testVolume("pvBadMode", "1Gi") + pvBadMode.Spec.AccessModes = []api.PersistentVolumeAccessMode{api.ReadOnlyMany} index := newPersistentVolumeOrderedIndex() index.store.Add(pv1) index.store.Add(pv5) index.store.Add(pv8) + index.store.Add(pvBadSize) + index.store.Add(pvBadMode) // expected exact match on size volume, _ := index.findBestMatchForClaim(claim) @@ -744,6 +749,22 @@ func TestFindingPreboundVolumes(t *testing.T) { if volume.Name != pv8.Name { t.Errorf("Expected %s but got volume %s instead", pv8.Name, volume.Name) } + + // pretend the volume with too small a size is pre-bound to the claim. should get the exact match. + pv8.Spec.ClaimRef = nil + pvBadSize.Spec.ClaimRef = claimRef + volume, _ = index.findBestMatchForClaim(claim) + if volume.Name != pv1.Name { + t.Errorf("Expected %s but got volume %s instead", pv1.Name, volume.Name) + } + + // pretend the volume without the right access mode is pre-bound to the claim. should get the exact match. + pvBadSize.Spec.ClaimRef = nil + pvBadMode.Spec.ClaimRef = claimRef + volume, _ = index.findBestMatchForClaim(claim) + if volume.Name != pv1.Name { + t.Errorf("Expected %s but got volume %s instead", pv1.Name, volume.Name) + } } // byCapacity is used to order volumes by ascending storage size