fix auto-orphaning logic (#414)

cbarbian-sap · web-flow · commit 3c6d6a213e51 · 2026-04-19T12:49:21.000+02:00
diff --git a/pkg/reconciler/reconciler.go b/pkg/reconciler/reconciler.go
@@ -1366,9 +1366,11 @@ func (r *Reconciler) orphanObject(ctx context.Context, existingObject *unstructu
 	}
 
 	if existingObject.GetLabels()[r.labelKeyOwnerId] != hashedOwnerId {
-		return fmt.Errorf("owner conflict; object %s has no or different owner", types.ObjectKeyToString(existingObject))
+		// the object has a different owner; so we do not raise an owner id conflict error here
+		return nil
 	}
 
+	// do cleanup on orphaned object; note: this happens only if we own it; otherwise we already returned above
 	if isCrd(existingObject) || isApiService(existingObject) {
 		object := existingObject.DeepCopy()
 		if controllerutil.RemoveFinalizer(object, r.finalizer) {

Original file line number	Diff line number	Diff line change
`@@ -1366,9 +1366,11 @@ func (r Reconciler) orphanObject(ctx context.Context, existingObject unstructu`
`1366`	`1366`	`}`
`1367`	`1367`
`1368`	`1368`	`if existingObject.GetLabels()[r.labelKeyOwnerId] != hashedOwnerId {`
`1369`		`- return fmt.Errorf("owner conflict; object %s has no or different owner", types.ObjectKeyToString(existingObject))`
	`1369`	`+ // the object has a different owner; so we do not raise an owner id conflict error here`
	`1370`	`+ return nil`
`1370`	`1371`	`}`
`1371`	`1372`
	`1373`	`+ // do cleanup on orphaned object; note: this happens only if we own it; otherwise we already returned above`
`1372`	`1374`	`if isCrd(existingObject) \|\| isApiService(existingObject) {`
`1373`	`1375`	`object := existingObject.DeepCopy()`
`1374`	`1376`	`if controllerutil.RemoveFinalizer(object, r.finalizer) {`