Skip to content

Commit ba697bc

Browse files
committed
fix: send delete request before removing finalizers
1 parent 090dc80 commit ba697bc

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

cmd/clusterctl/client/cluster/mover.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,18 +1230,17 @@ func (o *objectMover) deleteSourceObject(ctx context.Context, nodeToDelete *node
12301230
sourceObj.GroupVersionKind(), sourceObj.GetNamespace(), sourceObj.GetName())
12311231
}
12321232

1233+
if err := cFrom.Delete(ctx, sourceObj); err != nil {
1234+
return errors.Wrapf(err, "error deleting %q %s/%s",
1235+
sourceObj.GroupVersionKind(), sourceObj.GetNamespace(), sourceObj.GetName())
1236+
}
1237+
12331238
if len(sourceObj.GetFinalizers()) > 0 {
12341239
if err := cFrom.Patch(ctx, sourceObj, removeFinalizersPatch); err != nil {
12351240
return errors.Wrapf(err, "error removing finalizers from %q %s/%s",
12361241
sourceObj.GroupVersionKind(), sourceObj.GetNamespace(), sourceObj.GetName())
12371242
}
12381243
}
1239-
1240-
if err := cFrom.Delete(ctx, sourceObj); err != nil {
1241-
return errors.Wrapf(err, "error deleting %q %s/%s",
1242-
sourceObj.GroupVersionKind(), sourceObj.GetNamespace(), sourceObj.GetName())
1243-
}
1244-
12451244
return nil
12461245
}
12471246

0 commit comments

Comments
 (0)