fix(appset): ignoreApplicationDifferences not working

[crenshaw-dev]

The original implementation failed to normalize both the live and the generated state, so the applied patch could contain fields which should have been ignored.

I did some refactoring here, but I think it was all necessary in order to properly normalize both manifests before calculating the patch.

🤖 Generated by Copilot at 7db7cc4

This pull request refactors and enhances the ApplicationSet controller and utils package to support ignoring differences between live and desired state of Application resources, and to log the patches that are applied. It also updates the documentation and adds unit tests for the new features.

[codecov]

Codecov Report

Attention: 65 lines in your changes are missing coverage. Please review.

Comparison is base (d429013) 49.55% compared to head (d6034a6) 49.55%.

Additional details and impacted files

@@           Coverage Diff           @@
##           master   #15965   +/-   ##
=======================================
  Coverage   49.55%   49.55%           
=======================================
  Files         269      269           
  Lines       46852    46891   +39     
=======================================
+ Hits        23216    23236   +20     
- Misses      21357    21374   +17     
- Partials     2279     2281    +2     

Files	Coverage Δ
pkg/apis/application/v1alpha1/types.go	58.58% <100.00%> (ø)
util/argo/argo.go	66.62% <100.00%> (+0.12%)	⬆️
...cationset/controllers/applicationset_controller.go	60.78% <33.33%> (+1.24%)	⬆️
applicationset/utils/createOrUpdate.go	20.42% <32.22%> (+20.42%)	⬆️

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[mzupan]

tested this from a slack thread and its now working as expected for switching branches

[ishitasequeira]

Thanks @crenshaw-dev. Tested the feature locally and overall code changes look good!

[zhammer]

do we have an ETA on when this fix will be released? thank you for the quick turnaround

[mzupan]

@zhammer 2.9 was released yesterday

[zhammer]

@mzupan might be missing something simple, but looking at the commits for the v2.9.0 tag, this fix is missing v2.9.0...master

[mzupan]

@zhammer it's there/. you just need to click the load more commits button a few times..

[zhammer]

@mzupan ah, my fault, thank you.

[math3vz]

@mzupan @crenshaw-dev hey guys, it looks like this feature is in the master branch but not in the 2.9.0 tag, am I missing something here?

2.9.0
https://github.com/argoproj/argo-cd/blob/v2.9.0/applicationset/controllers/applicationset_controller.go#L629 -> there's no appLog as second param

master
https://github.com/argoproj/argo-cd/blob/master/applicationset/controllers/applicationset_controller.go#L628 -> appLog is here

EDIT: I've been trying to use this feature using quay.io/argoproj/argocd:v2.9.0 and it didn't work, after changing the image to quay.io/argoproj/argocd:latest it did work

[ishitasequeira]

/cherry-pick release-2.9

[gcp-cherry-pick-bot]

Cherry-pick failed with Merge error 28edaf58b03d5b595d56084503661f69a2b5ad1e into temp-cherry-pick-64829f-release-2.9

[ishitasequeira]

I don't see it in v2.9.0 either. Thanks for pointing that out. Let me cherry-pick for 2.9.1

[zhammer]

ah thank you!

[ishitasequeira]

/cherry-pick release-2.9

[gcp-cherry-pick-bot]

Cherry-pick failed with Merge error 28edaf58b03d5b595d56084503661f69a2b5ad1e into temp-cherry-pick-64829f-release-2.9

[ishitasequeira]

As cherry-pick bot is failing, created PR #16299 for cherry-picking the changes to 2.9.1

[vl-kp]

When will 2.9.1 release?

[crenshaw-dev]

@vl-kp a couple hours ago!