Skip to content

[eno] Update Normalization Field Manager Logic#555

Merged
ruinan-liu merged 8 commits intomainfrom
users/ruinanliu/fix-normalizing-managers
Jan 15, 2026
Merged

[eno] Update Normalization Field Manager Logic#555
ruinan-liu merged 8 commits intomainfrom
users/ruinanliu/fix-normalizing-managers

Conversation

@ruinan-liu
Copy link
Contributor

@ruinan-liu ruinan-liu commented Jan 12, 2026 •
edited
Loading

@ruinan-liu ruinan-liu marked this pull request as ready for review January 13, 2026 20:07
xiazhan
xiazhan reviewed Jan 13, 2026
View reviewed changes
ruinan-liu
ruinan-liu commented Jan 13, 2026
View reviewed changes
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

jveski
jveski reviewed Jan 13, 2026
View reviewed changes
jveski
jveski reviewed Jan 13, 2026
View reviewed changes
ruinan-liu
ruinan-liu commented Jan 13, 2026
View reviewed changes
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

tilnl
tilnl reviewed Jan 14, 2026
View reviewed changes
jveski
jveski approved these changes Jan 14, 2026
View reviewed changes
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

ruinan-liu
ruinan-liu commented Jan 14, 2026
View reviewed changes
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

ruinan-liu commented Jan 15, 2026

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.

ruinan-liu
ruinan-liu commented Jan 15, 2026
View reviewed changes
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
@ruinan-liu
[eno] Update Normalization Field Manager Logic (#555)
be21618 
- Only migrate `f:metadata:annotation`, `f:metadata:labels`, and
`f:spec` during the migration.

Tested e2e pipeline passed:

https://msazure.visualstudio.com/CloudNativeCompute/_build/results?buildId=149448228&view=results

https://msazure.visualstudio.com/CloudNativeCompute/_build/results?buildId=149448289&view=results

https://msazure.visualstudio.com/CloudNativeCompute/_build/results?buildId=149448264&view=results

https://msazure.visualstudio.com/CloudNativeCompute/_build/results?buildId=149448364&view=results

https://msazure.visualstudio.com/CloudNativeCompute/_build/results?buildId=149448306&view=results

https://msazure.visualstudio.com/CloudNativeCompute/_build/results?buildId=149449489&view=results

https://dev.azure.com/msazure/CloudNativeCompute/_build/results?buildId=149448405&view=results
@ruinan-liu ruinan-liu mentioned this pull request Jan 15, 2026
Merged
ruinan-liu added a commit that referenced this pull request Jan 15, 2026
@ruinan-liu @yemreinci
[eno] Cherry-pick changes to eno release branch v0.2.x (#556)
3f99c21 
Cherry-picking below 2 commits to release branch
1. #552
2. #555

---------

Co-authored-by: yemreinci <18687880+yemreinci@users.noreply.github.com>
Co-authored-by: Yunus Inci <yinci@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jveski jveski jveski approved these changes

@xiazhan xiazhan xiazhan approved these changes

@tilnl tilnl tilnl approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ruinan-liu @jveski @xiazhan @tilnl