mirror of
https://github.com/argoproj/argo-cd
synced 2026-04-21 17:07:16 +00:00
8849c3f30c
* fix: Server side diff now works correctly with some fields removal Helps with https://github.com/argoproj/argo-cd/issues/20792 Removed and modified sets may only contain the fields that changed, not including key fields like "name". This can cause merge to fail, since it expects those fields to be present if they are present in the predicted live. Fortunately, we can inspect the set and derive the key fields necessary. Then they can be added to the set and used during a merge. Also, have a new test which fails before the fix, but passes now. Failure of the new test before the fix ``` Error: Received unexpected error: error removing non config mutations for resource Deployment/nginx-deployment: error reverting webhook removed fields in predicted live resource: .spec.template.spec.containers: element 0: associative list with keys has an element that omits key field "name" (and doesn't have default value) Test: TestServerSideDiff/will_test_removing_some_field_with_undoing_changes_done_by_webhook ``` Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> * Use new version of structured merge diff with a new option Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> * Add DCO Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> * Try to fix sonar exclusions config Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> --------- Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> |
||
|---|---|---|
| .. | ||
| aggr-clusterrole-config.json | ||
| aggr-clusterrole-live.json | ||
| data.go | ||
| deployment-config.json | ||
| deployment-live.json | ||
| elasticsearch-config.json | ||
| elasticsearch-live.json | ||
| endpoints-config.json | ||
| endpoints-live.json | ||
| grafana-clusterrole-config.json | ||
| grafana-clusterrole-live.json | ||
| mutatingwebhookconfig-config.json | ||
| mutatingwebhookconfig-live.json | ||
| openapiv2.bin | ||
| sealedsecret-config.json | ||
| sealedsecret-live.json | ||
| smd-deploy-config.yaml | ||
| smd-deploy-live.yaml | ||
| smd-deploy2-config.yaml | ||
| smd-deploy2-live.yaml | ||
| smd-deploy2-predicted-live.json | ||
| smd-service-config-2-ports.yaml | ||
| smd-service-config-ports.yaml | ||
| smd-service-config.yaml | ||
| smd-service-live-with-type.yaml | ||
| smd-service-live.yaml | ||
| spinnaker-sa-config.json | ||
| spinnaker-sa-live.json | ||
| ssd-service-config.yaml | ||
| ssd-service-live.yaml | ||
| ssd-service-predicted-live.json | ||
| wordpress-config.json | ||
| wordpress-live.json | ||