Skip to content

Commit

Permalink
Merge pull request #870 from topolvm/ignore-notfound-delete
Browse files Browse the repository at this point in the history
ignore not found error when delete the resources
  • Loading branch information
daichimukai committed Apr 4, 2024
2 parents 93059ac + e087dd7 commit d138b24
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions internal/controller/node_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,20 @@ func (r *NodeReconciler) cleanupLogicalVolume(ctx context.Context, log logr.Logg
lv2.Annotations[topolvm.GetLVPendingDeletionKey()] = "true"
controllerutil.RemoveFinalizer(lv2, topolvm.GetLogicalVolumeFinalizer())
if err := r.client.Patch(ctx, lv2, client.MergeFrom(lv)); err != nil {
if apierrors.IsNotFound(err) {
log.Info("LogicalVolume is already deleted", "name", lv.Name)
return nil
}
log.Error(err, "failed to patch LogicalVolume", "name", lv.Name)
return err
}
}

if err := r.client.Delete(ctx, lv); err != nil {
if apierrors.IsNotFound(err) {
log.Info("LogicalVolume is already deleted", "name", lv.Name)
return nil
}
log.Error(err, "failed to delete LogicalVolume", "name", lv.Name)
return err
}
Expand Down

0 comments on commit d138b24

Please sign in to comment.