move PD delete to AfterEach

test/e2e/persistent_volumes-gce.go

@@ -107,13 +107,10 @@ var _ = framework.KubeDescribe("PersistentVolumes:GCEPD [Volume]", func() {
 			framework.DeletePodWithWait(f, c, clientPod)
 			framework.PVPVCCleanup(c, ns, pv, pvc)
 			clientPod, pv, pvc, node = nil, nil, nil, ""
-		}
-	})
-
-	AddCleanupAction(func() {
-		if len(diskName) > 0 {
+			if diskName != "" {
 				framework.DeletePDWithRetry(diskName)
 			}
+		}
 	})
 
 	// Attach a persistent disk to a pod using a PVC.