argo-cd icon indicating copy to clipboard operation
argo-cd copied to clipboard

feat(appset): Support various merge strategies for merge generator

Open sonamkshenoy opened this issue 10 months ago • 7 comments

Support for various merge strategies in merge generator. Includes: left-join, left-join-uniq, inner-join, inner-join-uniq, full-join, full-join-uniq

This PR also allows more than one parameter sets to have the same merge key in the base generator

Fixes #11952, #12837, #14560

sonamkshenoy avatar Oct 23 '23 17:10 sonamkshenoy

@crenshaw-dev Please review. Thank you!!

Also, do you think it's better to have a more intuitive name for the flag? Something like allowNonUniqBaseMergeKeys

sonamkshenoy avatar Oct 23 '23 17:10 sonamkshenoy

Actually, I think we should probably have a string field called mergeMode to accommodate new modes as they come up.

crenshaw-dev avatar Oct 25 '23 16:10 crenshaw-dev

Hello ! This Pull request can make applicationSets very powerfull ! @sonamkshenoy do you work at it ? do you want some help ?

darkradish avatar Nov 26 '23 15:11 darkradish

Hey @darkradish Thank you! Yes, I'm actively working on it. Thanks for your offer to help; I'm actually waiting for a review from one of the maintainers. :)

sonamkshenoy avatar Dec 01 '23 16:12 sonamkshenoy

Codecov Report

Attention: Patch coverage is 72.22222% with 20 lines in your changes are missing coverage. Please review.

Project coverage is 49.50%. Comparing base (d595550) to head (c35ac69). Report is 185 commits behind head on master.

:exclamation: Current head c35ac69 differs from pull request most recent head 1548125. Consider uploading reports for the commit 1548125 to get more accurate results

Files Patch % Lines
applicationset/generators/merge.go 72.22% 13 Missing and 7 partials :warning:
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #16080      +/-   ##
==========================================
+ Coverage   49.48%   49.50%   +0.01%     
==========================================
  Files         271      271              
  Lines       47728    47774      +46     
==========================================
+ Hits        23620    23651      +31     
- Misses      21773    21782       +9     
- Partials     2335     2341       +6     

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

codecov[bot] avatar Dec 21 '23 16:12 codecov[bot]

Are there any plans to merge this awesome feature?

ptr1120 avatar Feb 20 '24 18:02 ptr1120

Same question here... will this feature be merged in the near future? This would help a lot!

Boeller666 avatar Mar 05 '24 22:03 Boeller666

I am also very interested in this

alancaldelas avatar Mar 09 '24 03:03 alancaldelas

Hi, what is the progress here, I would love to see this working as we have the need for exactly this feature. I could help out with this if you want.

ProbstenHias avatar Apr 18 '24 12:04 ProbstenHias

@sonamkshenoy If you would do the signoff for your commits we would be one step further towards getting this cool feature into prod. If you might have problems with signing old commits, you could follow this link

Boeller666 avatar Jun 04 '24 08:06 Boeller666

@sonamkshenoy If you would do the signoff for your commits we would be one step further towards getting this cool feature into prod. If you might have problems with signing old commits, you could follow this link

@sonamkshenoy we could really use this feature.

It seems the final commit is signed. Could this be squashed and rebased?

reedjosh avatar Jul 17 '24 21:07 reedjosh