github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #107166 from jsafrane/fix-pv-controller-tests

Browse Source 
Fix PV controller unit test 5-7
This commit is contained in:
Kubernetes Prow Robot 2022-01-04 23:03:27 -08:00 committed by GitHub
commit abfe397ceb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/controller/volume/persistentvolume/pv_controller_test.go
View File

@ -140,7 +140,7 @@ func TestControllerSync(t *testing.T) {
// delete the corresponding volume from apiserver, and report latency metric // delete the corresponding volume from apiserver, and report latency metric
"5-5 - delete claim and delete volume report metric", "5-5 - delete claim and delete volume report metric",
volumesWithAnnotation(pvutil.AnnDynamicallyProvisioned, "gcr.io/vendor-csi", volumesWithAnnotation(pvutil.AnnDynamicallyProvisioned, "gcr.io/vendor-csi",
newVolumeArray("volume5-6", "10Gi", "uid5-6", "claim5-6", v1.VolumeBound, v1.PersistentVolumeReclaimDelete, classExternal, pvutil.AnnBoundByController)), newVolumeArray("volume5-5", "10Gi", "uid5-5", "claim5-5", v1.VolumeBound, v1.PersistentVolumeReclaimDelete, classExternal, pvutil.AnnBoundByController)),
novolumes, novolumes,
claimWithAnnotation(pvutil.AnnStorageProvisioner, "gcr.io/vendor-csi", claimWithAnnotation(pvutil.AnnStorageProvisioner, "gcr.io/vendor-csi",
newClaimArray("claim5-5", "uid5-5", "1Gi", "volume5-5", v1.ClaimBound, &classExternal, pvutil.AnnBoundByController, pvutil.AnnBindCompleted)), newClaimArray("claim5-5", "uid5-5", "1Gi", "volume5-5", v1.ClaimBound, &classExternal, pvutil.AnnBoundByController, pvutil.AnnBindCompleted)),
@ -225,6 +225,18 @@ func TestControllerSync(t *testing.T) {
if err != nil { if err != nil {
return err return err
} }
// Wait for the PVC to get fully processed. This avoids races between PV controller and DeleteClaimEvent
// below.
err = wait.Poll(10*time.Millisecond, wait.ForeverTestTimeout, func() (bool, error) {
obj := ctrl.claims.List()[0]
claim := obj.(*v1.PersistentVolumeClaim)
return claim.Status.Phase == v1.ClaimLost, nil
})
if err != nil {
return err
}
// trying to remove the claim as well // trying to remove the claim as well
obj := ctrl.claims.List()[0] obj := ctrl.claims.List()[0]
claim := obj.(*v1.PersistentVolumeClaim) claim := obj.(*v1.PersistentVolumeClaim)
@ -324,6 +336,8 @@ func TestControllerSync(t *testing.T) {
fakeClaimWatch := watch.NewFake() fakeClaimWatch := watch.NewFake()
client.PrependWatchReactor("persistentvolumeclaims", core.DefaultWatchReactor(fakeClaimWatch, nil)) client.PrependWatchReactor("persistentvolumeclaims", core.DefaultWatchReactor(fakeClaimWatch, nil))
client.PrependWatchReactor("storageclasses", core.DefaultWatchReactor(watch.NewFake(), nil)) client.PrependWatchReactor("storageclasses", core.DefaultWatchReactor(watch.NewFake(), nil))
client.PrependWatchReactor("nodes", core.DefaultWatchReactor(watch.NewFake(), nil))
client.PrependWatchReactor("pods", core.DefaultWatchReactor(watch.NewFake(), nil))
informers := informers.NewSharedInformerFactory(client, controller.NoResyncPeriodFunc()) informers := informers.NewSharedInformerFactory(client, controller.NoResyncPeriodFunc())
ctrl, err := newTestController(client, informers, true) ctrl, err := newTestController(client, informers, true)