Dedupe management conflict errors

GoogleContainerTools / kpt-config-sync

Config Sync - used to sync Git, OCI and Helm charts to your clusters.

Apache License 2.0

240 stars 42 forks source link

Dedupe management conflict errors #1274

Closed karlkfi closed 3 months ago

karlkfi commented 3 months ago

Update KptManagementConflictError to use an "UNKNOWN" old manager so it can return a ManagementConflictError. The UNKNOWN string is not shown to users. It just acts as a placeholder to return from the ConflictingManager() method. The previously added de-dupe code in conflict.Handler prefers errors with real manager values. So when the remediator and updater return similar errors, only the one with both managers is reported in the RSync status.
Share the conflict.Handler between the Remediator & Updater so it can handle deduping at runtime, instead of when updating the status.

google-oss-prow[bot] commented 3 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nan-yu

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/GoogleContainerTools/kpt-config-sync/blob/main/OWNERS)~~ [nan-yu] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment