From bdb925b50ab238e4117ccf9d553fee9bef2be377 Mon Sep 17 00:00:00 2001 From: darshansreenivas Date: Sat, 21 Jun 2025 14:31:21 -0700 Subject: [PATCH 1/3] introducing finalizers to PersistentVolumeClaim --- pkg/controller/controller_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/controller/controller_test.go b/pkg/controller/controller_test.go index 7c5894ec0..2faab7f0e 100644 --- a/pkg/controller/controller_test.go +++ b/pkg/controller/controller_test.go @@ -532,6 +532,7 @@ func createFakeNamedPVC(requestBytes int64, name string, userAnnotations map[str Name: name, Namespace: "fake-ns", Annotations: annotations, + Finalizers: []string{"volume.kubernetes.io/clone-protection"}, }, Spec: v1.PersistentVolumeClaimSpec{ Selector: nil, // Provisioner doesn't support selector @@ -970,7 +971,7 @@ func TestFSTypeProvision(t *testing.T) { volOpts: controller.ProvisionOptions{ StorageClass: &storagev1.StorageClass{ ReclaimPolicy: &deletePolicy, - Parameters: map[string]string{ + Parameters: map[string]string{ // We deliberately skip fsType in sc param // "fstype": "", }, @@ -1028,7 +1029,7 @@ func TestFSTypeProvision(t *testing.T) { volOpts: controller.ProvisionOptions{ StorageClass: &storagev1.StorageClass{ ReclaimPolicy: &deletePolicy, - Parameters: map[string]string{ + Parameters: map[string]string{ // We deliberately skip fsType in sc param // "fstype": "xfs", }, From 7c8780c04c54791717d986b6d483ac2c2405cd0a Mon Sep 17 00:00:00 2001 From: darshansreenivas Date: Mon, 28 Jul 2025 14:50:28 -0700 Subject: [PATCH 2/3] adding fix to call api directly --- pkg/controller/controller_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/controller/controller_test.go b/pkg/controller/controller_test.go index 2faab7f0e..d9e8dc27a 100644 --- a/pkg/controller/controller_test.go +++ b/pkg/controller/controller_test.go @@ -6681,9 +6681,11 @@ func TestProvisionFromPVC(t *testing.T) { if tc.volOpts.PVC.Spec.DataSourceRef != nil || tc.volOpts.PVC.Spec.DataSource != nil { var claim *v1.PersistentVolumeClaim if tc.volOpts.PVC.Spec.DataSourceRef != nil { - claim, _ = claimLister.PersistentVolumeClaims(tc.volOpts.PVC.Namespace).Get(tc.volOpts.PVC.Spec.DataSourceRef.Name) + claim, _ = clientSet.CoreV1().PersistentVolumeClaims(tc.volOpts.PVC.Namespace).Get(context.Background(), + tc.volOpts.PVC.Spec.DataSourceRef.Name, metav1.GetOptions{}) } else if tc.volOpts.PVC.Spec.DataSource != nil { - claim, _ = claimLister.PersistentVolumeClaims(tc.volOpts.PVC.Namespace).Get(tc.volOpts.PVC.Spec.DataSource.Name) + claim, _ = clientSet.CoreV1().PersistentVolumeClaims(tc.volOpts.PVC.Namespace).Get(context.Background(), + tc.volOpts.PVC.Spec.DataSource.Name, metav1.GetOptions{}) } if claim != nil { set := checkFinalizer(claim, pvcCloneFinalizer) From 09aaf8704ad66ea1bd7566297873de4f0fca6e2e Mon Sep 17 00:00:00 2001 From: darshansreenivas Date: Mon, 28 Jul 2025 15:17:06 -0700 Subject: [PATCH 3/3] remove finalizers --- pkg/controller/controller_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/controller/controller_test.go b/pkg/controller/controller_test.go index d9e8dc27a..d2f006fe0 100644 --- a/pkg/controller/controller_test.go +++ b/pkg/controller/controller_test.go @@ -532,7 +532,6 @@ func createFakeNamedPVC(requestBytes int64, name string, userAnnotations map[str Name: name, Namespace: "fake-ns", Annotations: annotations, - Finalizers: []string{"volume.kubernetes.io/clone-protection"}, }, Spec: v1.PersistentVolumeClaimSpec{ Selector: nil, // Provisioner doesn't support selector