Skip to content

Conversation

@ruinan-liu ruinan-liu marked this pull request as ready for review January 13, 2026 20:07
Copy link
Contributor Author

@ruinan-liu ruinan-liu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Respond to comments

Copy link
Contributor Author

@ruinan-liu ruinan-liu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replied to comments

Copy link
Collaborator

@jveski jveski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM pending Allan's +1

Copy link
Contributor Author

@ruinan-liu ruinan-liu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reply to comments

@ruinan-liu
Copy link
Contributor Author

The early return true, nil after NormalizeConflictingManagers is problematic. That step only adjusts managedFields to unblock SSA; it does not represent a durable desired-state change. Returning early causes the controller to requeue before reaching the SSA dry-run/apply path, so the resource is never actually applied. Since managedFields normalization alone may not converge, this can also lead to repeated requeues. We need to continue into the SSA flow in the same reconciliation so ownership converges and the next reconcile observes a stable, unmodified resource.

Copy link
Contributor Author

@ruinan-liu ruinan-liu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added comments

@ruinan-liu ruinan-liu merged commit c72c021 into main Jan 15, 2026
63 checks passed
ruinan-liu added a commit that referenced this pull request Jan 15, 2026
Cherry-picking below 2 commits to release branch
1. #552
2. #555

---------

Co-authored-by: yemreinci <[email protected]>
Co-authored-by: Yunus Inci <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants