fix: use ownership instead of revision to guard teardown deletion

When an Owner is provided, check whether we are the controller via
detectOwner rather than comparing revision annotations. Owner refs
are the authoritative signal for ownership and correctly handle
orphaning deletions where the revision annotation may have been
updated by a different reconciliation pass. Callers without an
Owner fall back to the existing revision comparison.

Author: erdii

machinery/objects.go

@@ -151,19 +151,10 @@ func (e *ObjectEngine) Teardown(
 		return false, fmt.Errorf("getting object before deletion: %w", err)
 	}
 
-	// Check revision matches.
-	actualRevision, err := e.getObjectRevision(actualObject)
-	if err != nil {
-		return false, fmt.Errorf("getting object revision: %w", err)
-	}
-
-	// Object is not owned by this revision
-	if actualRevision != revision {
-		if options.Owner == nil {
-			// No Owner to remove from the object, return.
-			return true, nil
-		}
-
+	if options.Owner != nil {
+		// Check ownership instead of revision to determine if we should delete.
+		// If we're not the controller, only remove our owner ref and leave the object in place.
+		// A possible reason for this could be an orphaning deletion.
 		ctrlSit, _ := e.detectOwner(options.Owner, options.OwnerStrategy, actualObject, nil)
 		if ctrlSit != ctrlSituationIsController {
 			// Remove us from owners list:
@@ -173,6 +164,16 @@ func (e *ObjectEngine) Teardown(
 			// TODO should we check if the patch differs from actualObject before firing the request?
 			return true, e.writer.Patch(ctx, patch, client.MergeFrom(actualObject))
 		}
+	} else {
+		// No Owner to check against — fall back to revision comparison.
+		actualRevision, err := e.getObjectRevision(actualObject)
+		if err != nil {
+			return false, fmt.Errorf("getting object revision: %w", err)
+		}
+
+		if actualRevision != revision {
+			return true, nil
+		}
 	}
 
 	// Actually delete the object.