diff --git a/pkg/common-controller/framework_test.go b/pkg/common-controller/framework_test.go index 54d000d17..790556fb7 100644 --- a/pkg/common-controller/framework_test.go +++ b/pkg/common-controller/framework_test.go @@ -1299,16 +1299,13 @@ func testSyncContentError(ctrl *csiSnapshotCommonController, reactor *snapshotRe } func testAddPVCFinalizer(ctrl *csiSnapshotCommonController, reactor *snapshotReactor, test controllerTest) error { - thisTestVolumeSnapshot = test.initialSnapshots[0] return ctrl.ensurePVCFinalizer(test.initialSnapshots[0]) } func testRemovePVCFinalizer(ctrl *csiSnapshotCommonController, reactor *snapshotReactor, test controllerTest) error { return ctrl.checkandRemovePVCFinalizer(test.initialSnapshots[0], false) } -var thisTestVolumeSnapshot *crdv1.VolumeSnapshot func testAddSnapshotFinalizer(ctrl *csiSnapshotCommonController, reactor *snapshotReactor, test controllerTest) error { - thisTestVolumeSnapshot = test.initialSnapshots[0] return ctrl.addSnapshotFinalizer(test.initialSnapshots[0], true, true) } diff --git a/pkg/common-controller/snapshot_controller.go b/pkg/common-controller/snapshot_controller.go index 77d22bc2f..3f5cae945 100644 --- a/pkg/common-controller/snapshot_controller.go +++ b/pkg/common-controller/snapshot_controller.go @@ -1506,23 +1506,12 @@ func (ctrl *csiSnapshotCommonController) addSnapshotFinalizer(snapshot *crdv1.Vo var updatedSnapshot *crdv1.VolumeSnapshot var err error - // var patches []utils.PatchOp finalizersToAdd := []string{} // If finalizers exist already, add new ones to the end of the array if addSourceFinalizer { - // patches = append(patches, utils.PatchOp{ - // Op: "add", - // Path: "/metadata/finalizers/-", - // Value: utils.VolumeSnapshotAsSourceFinalizer, - // }) finalizersToAdd = append(finalizersToAdd, utils.VolumeSnapshotAsSourceFinalizer) } if addBoundFinalizer { - // patches = append(patches, utils.PatchOp{ - // Op: "add", - // Path: "/metadata/finalizers/-", - // Value: utils.VolumeSnapshotBoundFinalizer, - // }) finalizersToAdd = append(finalizersToAdd, utils.VolumeSnapshotBoundFinalizer) } patches := utils.PatchOpsToAddFinalizers(snapshot, finalizersToAdd...)