alexlebens/external-snapshotter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add content finalizer patch

Browse Source 
Signed-off-by: Grant Griffiths <ggriffiths@purestorage.com>
This commit is contained in:
Grant Griffiths
2021-08-04 07:12:33 -07:00
parent afff04176d
commit 36b6b879ba
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/common-controller/snapshot_controller.go
View File

@@ -809,23 +809,14 @@ func (ctrl *csiSnapshotCommonController) updateSnapshotErrorStatusWithEvent(snap
// addContentFinalizer adds a Finalizer for VolumeSnapshotContent. // addContentFinalizer adds a Finalizer for VolumeSnapshotContent.
func (ctrl *csiSnapshotCommonController) addContentFinalizer(content *crdv1.VolumeSnapshotContent) error { func (ctrl *csiSnapshotCommonController) addContentFinalizer(content *crdv1.VolumeSnapshotContent) error {
// patches := []utils.PatchOp{ var patches []utils.PatchOp
// { patches = append(patches, utils.PatchOp{
// Op: "add", Op: "add",
// Path: "/metadata/finalizers/-", Path: "/metadata/finalizers/-",
// Value: utils.VolumeSnapshotContentFinalizer, Value: utils.VolumeSnapshotContentFinalizer,
// }, })
// }
// newContent, err := utils.PatchVolumeSnapshotContent(content, patches, ctrl.clientset) newContent, err := utils.PatchVolumeSnapshotContent(content, patches, ctrl.clientset)
// if err != nil {
// return newControllerUpdateError(content.Name, err.Error())
// }
contentClone := content.DeepCopy()
contentClone.ObjectMeta.Finalizers = append(contentClone.ObjectMeta.Finalizers, utils.VolumeSnapshotContentFinalizer)
newContent, err := ctrl.clientset.SnapshotV1().VolumeSnapshotContents().Update(context.TODO(), contentClone, metav1.UpdateOptions{})
if err != nil { if err != nil {
return newControllerUpdateError(content.Name, err.Error()) return newControllerUpdateError(content.Name, err.Error())
} }
@@ -1440,8 +1431,6 @@ func (ctrl *csiSnapshotCommonController) addSnapshotFinalizer(snapshot *crdv1.Vo
}) })
} }
klog.Infof("GGCSI - ADD SNAPSHOT FINALIZER - snapshot: %v", snapshot)
klog.Infof("GGCSI - ADD SNAPSHOT FINALIZER - patches: %v", patches)
updatedSnapshot, err = utils.PatchVolumeSnapshot(snapshot, patches, ctrl.clientset) updatedSnapshot, err = utils.PatchVolumeSnapshot(snapshot, patches, ctrl.clientset)
if err != nil { if err != nil {
return newControllerUpdateError(utils.SnapshotKey(snapshot), err.Error()) return newControllerUpdateError(utils.SnapshotKey(snapshot), err.Error())