fix: configurable CMP tar exclusions (#9675) by notfromstatefarm · Pull Request #9789 · argoproj/argo-cd

notfromstatefarm · 2022-06-26T15:51:06Z

Signed-off-by: notfromstatefarm 86763948+notfromstatefarm@users.noreply.github.com

Recently, a breaking change was implemented where the .git folder will not be transmitted to CMP sidecars. @crenshaw-dev suggested making this configurable. This PR sets out to do that via the repo server arguments.

This is my first PR, so apologies if I missed anything!

Checklist:

codecov · 2022-06-26T16:06:04Z

Codecov Report

Merging #9789 (304f1de) into master (a041bf8) will decrease coverage by 0.00%.
The diff coverage is 55.00%.

@@            Coverage Diff             @@
##           master    #9789      +/-   ##
==========================================
- Coverage   45.79%   45.78%   -0.01%     
==========================================
  Files         227      227              
  Lines       26920    26924       +4     
==========================================
+ Hits        12327    12328       +1     
- Misses      12911    12914       +3     
  Partials     1682     1682

Impacted Files	Coverage Δ
util/env/env.go	`86.95% <0.00%> (-3.96%)`	⬇️
util/app/discovery/discovery.go	`40.27% <50.00%> (ø)`
reposerver/repository/repository.go	`63.78% <66.66%> (+0.07%)`	⬆️
util/cmp/stream.go	`52.23% <100.00%> (-0.36%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a041bf8...304f1de. Read the comment docs.

notfromstatefarm · 2022-06-26T17:36:55Z

Going to work on this PR a little bit more - need to figure out how to add the environment variables.

notfromstatefarm · 2022-06-26T18:32:39Z

Figured out how to add the environment variables! It's a little weird compared to the other ones since it's an array. I had to make a way to separate it when using environment variables versus the repeatable flag. Perhaps I should just use the same logic in the flag and make it non-repeatable.

But, all ready and tested locally! I was able to selectively filter out any combination of files and folders.

notfromstatefarm · 2022-06-26T19:07:55Z

Had to fix some small documentation issues for checks to pass. Tested in our real dev clusters. All working. 🎉

cmd/argocd-repo-server/commands/argocd_repo_server.go

docs/operator-manual/argocd-cmd-params-cm.yaml

cmd/argocd-repo-server/commands/argocd_repo_server.go

util/app/discovery/discovery.go

util/cmp/stream_test.go

util/env/env.go

Signed-off-by: notfromstatefarm <86763948+notfromstatefarm@users.noreply.github.com>

crenshaw-dev · 2022-06-27T20:47:28Z

reposerver/repository/repository.go

 type generateManifestOpt struct {
-	cmpTarDoneCh chan<- bool
+	cmpTarDoneCh        chan<- bool
+	cmpTarExcludedGlobs []string


@leoluz is this type designed to carry the generate params so we can keep that function signature small? If so, 1) @notfromstatefarm went the right direction here and 2) I should probably refactor to put some other things on this struct.

If that's incorrect, we can refactor to pass this param directly to the function.

crenshaw-dev

@notfromstatefarm lgtm! I have one question for Leo. Once he responds, I expect to be able to merge.

Might be a few days before we get the release out with this fix.

smridge · 2022-06-27T20:56:51Z

USERS.md

 1. [Chargetrip](https://chargetrip.com)
 1. [Chime](https://www.chime.com)
 1. [Cisco ET&I](https://eti.cisco.com/)
+1. [Cobalt](https://www.cobalt.io/)


* feat: configurable CMP tar exclusions Signed-off-by: notfromstatefarm <86763948+notfromstatefarm@users.noreply.github.com> * rename cmp to plugin Signed-off-by: notfromstatefarm <86763948+notfromstatefarm@users.noreply.github.com> * add test for tar stream exclusions Signed-off-by: notfromstatefarm <86763948+notfromstatefarm@users.noreply.github.com> * fix tests Signed-off-by: notfromstatefarm <86763948+notfromstatefarm@users.noreply.github.com> * update cmp guide Signed-off-by: notfromstatefarm <86763948+notfromstatefarm@users.noreply.github.com> * fully parameterize Signed-off-by: notfromstatefarm <86763948+notfromstatefarm@users.noreply.github.com>

crenshaw-dev · 2022-06-29T20:27:57Z

Cherry-picked onto release-2.4 for 2.4.4.

notfromstatefarm force-pushed the feat/configurable-tar-filter branch from ebb73cf to 122829e Compare June 26, 2022 15:54

notfromstatefarm force-pushed the feat/configurable-tar-filter branch from 122829e to 1939790 Compare June 26, 2022 16:21

notfromstatefarm marked this pull request as draft June 26, 2022 16:34

notfromstatefarm force-pushed the feat/configurable-tar-filter branch 2 times, most recently from b59bb8f to 57eed89 Compare June 26, 2022 18:26

notfromstatefarm marked this pull request as ready for review June 26, 2022 18:30

notfromstatefarm force-pushed the feat/configurable-tar-filter branch 2 times, most recently from 293f080 to 62c0fe5 Compare June 26, 2022 19:02

crenshaw-dev requested changes Jun 27, 2022

View reviewed changes

notfromstatefarm force-pushed the feat/configurable-tar-filter branch from 9c31b17 to d11ee1c Compare June 27, 2022 13:55

notfromstatefarm added 3 commits June 27, 2022 09:58

feat: configurable CMP tar exclusions

d4c5ea2

Signed-off-by: notfromstatefarm <86763948+notfromstatefarm@users.noreply.github.com>

rename cmp to plugin

35ae804

Signed-off-by: notfromstatefarm <86763948+notfromstatefarm@users.noreply.github.com>

add test for tar stream exclusions

7aa5135

Signed-off-by: notfromstatefarm <86763948+notfromstatefarm@users.noreply.github.com>

notfromstatefarm force-pushed the feat/configurable-tar-filter branch from d11ee1c to 7aa5135 Compare June 27, 2022 13:59

fix tests

3b4460a

Signed-off-by: notfromstatefarm <86763948+notfromstatefarm@users.noreply.github.com>

notfromstatefarm requested a review from crenshaw-dev June 27, 2022 14:54

notfromstatefarm added 3 commits June 27, 2022 11:56

merge master

9363086

Signed-off-by: notfromstatefarm <86763948+notfromstatefarm@users.noreply.github.com>

update cmp guide

ac9b63e

Signed-off-by: notfromstatefarm <86763948+notfromstatefarm@users.noreply.github.com>

fully parameterize

304f1de

Signed-off-by: notfromstatefarm <86763948+notfromstatefarm@users.noreply.github.com>

crenshaw-dev added the cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch label Jun 27, 2022

crenshaw-dev changed the title ~~feat: configurable CMP tar exclusions (#9675)~~ fix: configurable CMP tar exclusions (#9675) Jun 27, 2022

crenshaw-dev reviewed Jun 27, 2022

View reviewed changes

crenshaw-dev requested review from crenshaw-dev and leoluz June 27, 2022 20:48

crenshaw-dev approved these changes Jun 27, 2022

View reviewed changes

smridge reviewed Jun 27, 2022

View reviewed changes

crenshaw-dev merged commit 3550252 into argoproj:master Jun 29, 2022

notfromstatefarm mentioned this pull request Jul 4, 2022

docs: small fix for plugin stream filtering #9871

Merged

10 tasks

notfromstatefarm mentioned this pull request Aug 9, 2022

REQUEST: New membership for notfromstatefarm argoproj/argoproj#147

Closed

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: configurable CMP tar exclusions (#9675)#9789

fix: configurable CMP tar exclusions (#9675)#9789
crenshaw-dev merged 7 commits intoargoproj:masterfrom
notfromstatefarm:feat/configurable-tar-filter

notfromstatefarm commented Jun 26, 2022 •

edited

Loading

Uh oh!

codecov bot commented Jun 26, 2022 •

edited

Loading

Uh oh!

notfromstatefarm commented Jun 26, 2022

Uh oh!

notfromstatefarm commented Jun 26, 2022 •

edited

Loading

Uh oh!

notfromstatefarm commented Jun 26, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

crenshaw-dev Jun 27, 2022

Uh oh!

crenshaw-dev left a comment

Uh oh!

smridge Jun 27, 2022

Uh oh!

crenshaw-dev commented Jun 29, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

notfromstatefarm commented Jun 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Jun 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

notfromstatefarm commented Jun 26, 2022

Uh oh!

notfromstatefarm commented Jun 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

notfromstatefarm commented Jun 26, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

crenshaw-dev Jun 27, 2022

Choose a reason for hiding this comment

Uh oh!

crenshaw-dev left a comment

Choose a reason for hiding this comment

Uh oh!

smridge Jun 27, 2022

Choose a reason for hiding this comment

Uh oh!

crenshaw-dev commented Jun 29, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

notfromstatefarm commented Jun 26, 2022 •

edited

Loading

codecov bot commented Jun 26, 2022 •

edited

Loading

notfromstatefarm commented Jun 26, 2022 •

edited

Loading