Code change:
}) }) <ins> ginkgo.Describe("CSI Conformance", func() { var pvols e2epv.PVMap var claims e2epv.PVCMap ginkgo.AfterEach(func(ctx context.Context) { framework.Logf("AfterEach: deleting %v PVCs and %v PVs...", len(claims), len(pvols)) errs := e2epv.PVPVCMapCleanup(ctx, c, ns, pvols, claims) if len(errs) > 0 { errmsg := []string{} for _, e := range errs { errmsg = append(errmsg, e.Error()) } framework.Failf("AfterEach: Failed to delete 1 or more PVs/PVCs. Errors: %v", strings.Join(errmsg, "; ")) } }) ginkgo.It("should run through the lifecycle of a PV and a PVC", func(ctx context.Context) { pvClient := c.CoreV1().PersistentVolumes() pvcClient := c.CoreV1().PersistentVolumeClaims(ns) ginkgo.By("Creating initial PV and PVC") // Configure csiDriver defaultFSGroupPolicy := storagev1.ReadWriteOnceWithFSTypeFSGroupPolicy csiDriverLabel := map[string]string{"e2e-test": f.UniqueName} csiDriver := &storagev1.CSIDriver{ ObjectMeta: metav1.ObjectMeta{ Name:   "inline-driver-" + string(uuid.NewUUID()), Labels: csiDriverLabel, }, Spec: storagev1.CSIDriverSpec{ VolumeLifecycleModes: []storagev1.VolumeLifecycleMode{ storagev1.VolumeLifecyclePersistent, }, FSGroupPolicy: &defaultFSGroupPolicy, }, } pvNamePrefix := ns + "-" pvHostPathConfig := e2epv.PersistentVolumeConfig{ NamePrefix: pvNamePrefix, Labels:     volLabel, PVSource: v1.PersistentVolumeSource{ CSI: &v1.CSIPersistentVolumeSource{ Driver:       csiDriver.Name, VolumeHandle: "e2e-conformance", }, }, } numPVs, numPVCs := 1, 1 pvols, claims, err = e2epv.CreatePVsPVCs(ctx, numPVs, numPVCs, c, f.Timeouts, ns, pvHostPathConfig, pvcConfig) framework.ExpectNoError(err, "Failed to create the requested storage resources") ginkgo.By(fmt.Sprintf("Listing all PVs with the labelSelector: %q", volLabel.AsSelector().String())) pvList, err := pvClient.List(ctx, metav1.ListOptions{LabelSelector: volLabel.AsSelector().String()}) framework.ExpectNoError(err, "Failed to list PVs with the labelSelector: %q", volLabel.AsSelector().String()) gomega.Expect(pvList.Items).To(gomega.HaveLen(1)) initialPV := pvList.Items[0] ginkgo.By(fmt.Sprintf("Listing PVCs in namespace %q", ns)) pvcList, err := pvcClient.List(ctx, metav1.ListOptions{}) framework.ExpectNoError(err, "Failed to list PVCs with the labelSelector: %q", volLabel.AsSelector().String()) gomega.Expect(pvcList.Items).To(gomega.HaveLen(1)) initialPVC := pvcList.Items[0] ginkgo.By(fmt.Sprintf("Patching the PV %q", initialPV.Name)) payload := "{"metadata":{"labels":{"" + initialPV.Name + "":"patched"}}}" patchedPV, err := pvClient.Patch(ctx, initialPV.Name, types.StrategicMergePatchType, []byte(payload), metav1.PatchOptions{}) framework.ExpectNoError(err, "Failed to patch PV %q", initialPV.Name) gomega.Expect(patchedPV.Labels).To(gomega.HaveKeyWithValue(patchedPV.Name, "patched"), "Checking that patched label has been applied") ginkgo.By(fmt.Sprintf("Patching the PVC %q", initialPVC.Name)) payload = "{"metadata":{"labels":{"" + initialPVC.Name + "":"patched"}}}" patchedPVC, err := pvcClient.Patch(ctx, initialPVC.Name, types.StrategicMergePatchType, []byte(payload), metav1.PatchOptions{}) framework.ExpectNoError(err, "Failed to patch PVC %q", initialPVC.Name) gomega.Expect(patchedPVC.Labels).To(gomega.HaveKeyWithValue(patchedPVC.Name, "patched"), "Checking that patched label has been applied") ginkgo.By(fmt.Sprintf("Getting PV %q", patchedPV.Name)) retrievedPV, err := pvClient.Get(ctx, patchedPV.Name, metav1.GetOptions{}) framework.ExpectNoError(err, "Failed to get PV %q", patchedPV.Name) gomega.Expect(retrievedPV.UID).To(gomega.Equal(patchedPV.UID)) ginkgo.By(fmt.Sprintf("Getting PVC %q", patchedPVC.Name)) retrievedPVC, err := pvcClient.Get(ctx, patchedPVC.Name, metav1.GetOptions{}) framework.ExpectNoError(err, "Failed to get PVC %q", patchedPVC.Name) gomega.Expect(retrievedPVC.UID).To(gomega.Equal(patchedPVC.UID)) ginkgo.By(fmt.Sprintf("Deleting PVC %q", retrievedPVC.Name)) err = pvcClient.Delete(ctx, retrievedPVC.Name, metav1.DeleteOptions{}) framework.ExpectNoError(err, "Failed to delete PVC %q", retrievedPVC.Name) ginkgo.By(fmt.Sprintf("Confirm deletion of PVC %q", retrievedPVC.Name)) type state struct { PersistentVolumes      []v1.PersistentVolume PersistentVolumeClaims []v1.PersistentVolumeClaim } err = framework.Gomega().Eventually(ctx, framework.HandleRetry(func(ctx context.Context) (*state, error) { pvcList, err := pvcClient.List(ctx, metav1.ListOptions{}) if err != nil { return nil, fmt.Errorf("failed to list pvc: %w", err) } return &state{ PersistentVolumeClaims: pvcList.Items, }, nil })).WithTimeout(30 * time.Second).Should(framework.MakeMatcher(func(s *state) (func() string, error) { if len(s.PersistentVolumeClaims) == 0 { return nil, nil } return func() string { return fmt.Sprintf("Expected pvc to be deleted, found %q", s.PersistentVolumeClaims[0].Name) }, nil })) framework.ExpectNoError(err, "Timeout while waiting to confirm PVC %q deletion", retrievedPVC.Name) ginkgo.By(fmt.Sprintf("Deleting PV %q", retrievedPV.Name)) err = pvClient.Delete(ctx, retrievedPV.Name, metav1.DeleteOptions{}) framework.ExpectNoError(err, "Failed to delete PV %q", retrievedPV.Name) ginkgo.By(fmt.Sprintf("Confirm deletion of PV %q", retrievedPV.Name)) err = framework.Gomega().Eventually(ctx, framework.HandleRetry(func(ctx context.Context) (*state, error) { pvList, err := pvClient.List(ctx, metav1.ListOptions{LabelSelector: volLabel.AsSelector().String()}) if err != nil { return nil, fmt.Errorf("failed to list pv: %w", err) } return &state{ PersistentVolumes: pvList.Items, }, nil })).WithTimeout(30 * time.Second).Should(framework.MakeMatcher(func(s *state) (func() string, error) { if len(s.PersistentVolumes) == 0 { return nil, nil } return func() string { return fmt.Sprintf("Expected pv to be deleted, found %q", s.PersistentVolumes[0].Name) }, nil })) framework.ExpectNoError(err, "Timeout while waiting to confirm PV %q deletion", retrievedPV.Name) ginkgo.By("Recreating another PV & PVC") pvols, claims, err = e2epv.CreatePVsPVCs(ctx, numPVs, numPVCs, c, f.Timeouts, ns, pvHostPathConfig, pvcConfig) framework.ExpectNoError(err, "Failed to create the requested storage resources") var pvName string for key := range pvols { pvName = key } var pvcName string for key := range claims { pvcName = key.Name } ginkgo.By(fmt.Sprintf("Updating the PV %q", pvName)) var updatedPV *v1.PersistentVolume pvSelector := labels.Set{pvName: "updated"}.AsSelector().String() err = retry.RetryOnConflict(retry.DefaultRetry, func() error { pv, err := pvClient.Get(ctx, pvName, metav1.GetOptions{}) framework.ExpectNoError(err, "Unable to get PV %q", pvName) pv.Labels[pvName] = "updated" updatedPV, err = pvClient.Update(ctx, pv, metav1.UpdateOptions{}) return err }) framework.ExpectNoError(err, "failed to update PV %q", pvName) gomega.Expect(updatedPV.Labels).To(gomega.HaveKeyWithValue(updatedPV.Name, "updated"), "Checking that updated label has been applied") ginkgo.By(fmt.Sprintf("Updating the PVC %q", pvcName)) var updatedPVC *v1.PersistentVolumeClaim pvcSelector := labels.Set{pvcName: "updated"}.AsSelector().String() err = retry.RetryOnConflict(retry.DefaultRetry, func() error { pvc, err := pvcClient.Get(ctx, pvcName, metav1.GetOptions{}) framework.ExpectNoError(err, "Unable to get PVC %q", pvcName) pvc.Labels = map[string]string{ pvcName: "updated", } updatedPVC, err = pvcClient.Update(ctx, pvc, metav1.UpdateOptions{}) return err }) framework.ExpectNoError(err, "failed to update PVC %q", pvcName) gomega.Expect(updatedPVC.Labels).To(gomega.HaveKeyWithValue(updatedPVC.Name, "updated"), "Checking that updated label has been applied") ginkgo.By(fmt.Sprintf("Listing PVCs in all namespaces with the labelSelector: %q", pvcSelector)) pvcList, err = c.CoreV1().PersistentVolumeClaims("").List(ctx, metav1.ListOptions{LabelSelector: pvcSelector}) framework.ExpectNoError(err, "Failed to list PVCs in all namespaces with the labelSelector: %q", pvcSelector) gomega.Expect(pvcList.Items).To(gomega.HaveLen(1)) ginkgo.By(fmt.Sprintf("Deleting PVC %q via DeleteCollection", pvcName)) err = pvcClient.DeleteCollection(ctx, metav1.DeleteOptions{}, metav1.ListOptions{LabelSelector: pvcSelector}) framework.ExpectNoError(err, "Failed to delete PVC %q", retrievedPVC.Name) ginkgo.By(fmt.Sprintf("Confirm deletion of PVC %q", pvcName)) err = framework.Gomega().Eventually(ctx, framework.HandleRetry(func(ctx context.Context) (*state, error) { pvcList, err := pvcClient.List(ctx, metav1.ListOptions{LabelSelector: pvcSelector}) if err != nil { return nil, fmt.Errorf("failed to list pvc: %w", err) } return &state{ PersistentVolumeClaims: pvcList.Items, }, nil })).WithTimeout(30 * time.Second).Should(framework.MakeMatcher(func(s *state) (func() string, error) { if len(s.PersistentVolumeClaims) == 0 { return nil, nil } return func() string { return fmt.Sprintf("Expected pvc to be deleted, found %q", s.PersistentVolumeClaims[0].Name) }, nil })) framework.ExpectNoError(err, "Timeout while waiting to confirm PVC %q deletion", pvcName) ginkgo.By(fmt.Sprintf("Deleting PV %q via DeleteCollection", pvName)) err = pvClient.DeleteCollection(ctx, metav1.DeleteOptions{}, metav1.ListOptions{LabelSelector: pvSelector}) framework.ExpectNoError(err, "Failed to delete PV %q", retrievedPVC.Name) ginkgo.By(fmt.Sprintf("Confirm deletion of PV %q", pvName)) err = framework.Gomega().Eventually(ctx, framework.HandleRetry(func(ctx context.Context) (*state, error) { pvList, err := pvClient.List(ctx, metav1.ListOptions{LabelSelector: pvSelector}) if err != nil { return nil, fmt.Errorf("failed to list pv: %w", err) } return &state{ PersistentVolumes: pvList.Items, }, nil })).WithTimeout(30 * time.Second).Should(framework.MakeMatcher(func(s *state) (func() string, error) { if len(s.PersistentVolumes) == 0 { return nil, nil } return func() string { return fmt.Sprintf("Expected pv to be deleted, found %q", s.PersistentVolumes[0].Name) }, nil })) framework.ExpectNoError(err, "Timeout while waiting to confirm PV %q deletion", retrievedPV.Name) }) }) </ins> // testsuites/multivolume tests can now run with windows nodes // This test is not compatible with windows because the default StorageClass // doesn't have the ntfs parameter, we can't change the status of the cluster

Related discussion:
text: [X] test approval issue : [X] test pr : [x] two weeks soak end date : 11 Sept 2023 [x] test promotion pr : [x] remove endpoint from According to following APIsnoop query, there are two PersistentVolume and three PersistentVolumeClaim endpoints that are untested. Using a number of existing e2e test practices a new has been created to provide future Conformance coverage for the 13 endpoints. The e2e logs for this test are listed below. This query shows the following PV and PVC endpoints are hit within a short period of running this e2e test. If a test with these calls gets merged, test coverage will go up by 13 points This test is also created with the goal of conformance promotion. /sig testing /sig architecture /area conformance
/triage accepted
/cc
/reopen For tracking the rest of the steps to Promotion
Reopened this issue. <detailsIn response to : /reopen For tracking the rest of the steps to Promotion Instructions for interacting with me using PR comments are available . If you have questions or suggestions related to my behavior, please file an issue against the repository. </details