mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Merge pull request #88118 from pohly/wait-for-persistent-volume-deleted-error
e2e/storage: check result of WaitForPersistentVolumeDeleted
This commit is contained in:
commit
8d257ad315
@ -188,7 +188,7 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
|
||||
claim, err := cs.CoreV1().PersistentVolumeClaims(claim.Namespace).Get(context.TODO(), claim.Name, metav1.GetOptions{})
|
||||
if err == nil {
|
||||
cs.CoreV1().PersistentVolumeClaims(claim.Namespace).Delete(context.TODO(), claim.Name, metav1.DeleteOptions{})
|
||||
e2epv.WaitForPersistentVolumeDeleted(cs, claim.Spec.VolumeName, framework.Poll, 2*time.Minute)
|
||||
errs = append(errs, e2epv.WaitForPersistentVolumeDeleted(cs, claim.Spec.VolumeName, framework.Poll, 2*time.Minute))
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -100,7 +100,8 @@ var _ = utils.SIGDescribe("PV Protection", func() {
|
||||
ginkgo.By("Deleting the PV")
|
||||
err = client.CoreV1().PersistentVolumes().Delete(context.TODO(), pv.Name, *metav1.NewDeleteOptions(0))
|
||||
framework.ExpectNoError(err, "Error deleting PV")
|
||||
e2epv.WaitForPersistentVolumeDeleted(client, pv.Name, framework.Poll, e2epv.PVDeletingTimeout)
|
||||
err = e2epv.WaitForPersistentVolumeDeleted(client, pv.Name, framework.Poll, e2epv.PVDeletingTimeout)
|
||||
framework.ExpectNoError(err, "waiting for PV to be deleted")
|
||||
})
|
||||
|
||||
ginkgo.It("Verify that PV bound to a PVC is not removed immediately", func() {
|
||||
@ -127,6 +128,7 @@ var _ = utils.SIGDescribe("PV Protection", func() {
|
||||
framework.ExpectNoError(err, "Error deleting PVC")
|
||||
|
||||
ginkgo.By("Checking that the PV is automatically removed from the system because it's no longer bound to a PVC")
|
||||
e2epv.WaitForPersistentVolumeDeleted(client, pv.Name, framework.Poll, e2epv.PVDeletingTimeout)
|
||||
err = e2epv.WaitForPersistentVolumeDeleted(client, pv.Name, framework.Poll, e2epv.PVDeletingTimeout)
|
||||
framework.ExpectNoError(err, "waiting for PV to be deleted")
|
||||
})
|
||||
})
|
||||
|
@ -45,7 +45,7 @@ spec:
|
||||
- mountPath: /registration
|
||||
name: registration-dir
|
||||
- name: mock
|
||||
image: quay.io/k8scsi/mock-driver:v2.1.0
|
||||
image: quay.io/k8scsi/mock-driver:v3.1.0
|
||||
args:
|
||||
- "--name=mock.storage.k8s.io"
|
||||
- "--permissive-target-path" # because of https://github.com/kubernetes/kubernetes/issues/75535
|
||||
|
Loading…
Reference in New Issue
Block a user