replace StrategicMergePatchType with MergePatchType #2694
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of this PR
replace StrategicMergePatchType with MergePatchType #2432
Which issue(s) this PR fixes:
Fixes #2186
WHAT
🤖 Generated by Copilot at 82ebe2d
Improve pod annotation update logic in
pod.go
by using merge patch and enhancing error logging.🤖 Generated by Copilot at 82ebe2d
HOW
🤖 Generated by Copilot at 82ebe2d
reconcileAllocateSubnets
andreconcileRouteSubnets
functions to avoid conflicts with other controllers (link, link)reconcileAllocateSubnets
andreconcileRouteSubnets
functions (link, link)