Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(appset): performProgressiveSyncs only when the applicationset is using it (#15297) #15299

Merged
merged 6 commits into from
Oct 16, 2023
Merged

fix(appset): performProgressiveSyncs only when the applicationset is using it (#15297) #15299

merged 6 commits into from
Oct 16, 2023

Conversation

ericblackburn
Copy link
Contributor

@ericblackburn ericblackburn commented Aug 31, 2023

Fixes #15297

Updates the if/else statement so that the else statement used to call performProgressiveSyncs is only called when the applicationset is using it.

Note, my build is green. There seems to be some other bugs in Argo ,master, itself unrelated to this change. Those are not in scope for the this PR.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.

@ericblackburn ericblackburn changed the title fix(appset): performProgressiveSyncs only when the applicationset is using it fix(appset): performProgressiveSyncs only when the applicationset is using it (#15297) Aug 31, 2023
…using it

Signed-off-by: Eric Blackburn <eblackburn@indeed.com>
@codecov
Copy link

codecov bot commented Aug 31, 2023

Codecov Report

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

Comparison is base (dbc48f3) 49.67% compared to head (88c6a1e) 49.66%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #15299      +/-   ##
==========================================
- Coverage   49.67%   49.66%   -0.01%     
==========================================
  Files         267      267              
  Lines       46383    46385       +2     
==========================================
  Hits        23039    23039              
- Misses      21084    21086       +2     
  Partials     2260     2260              
Files Coverage Δ
...cationset/controllers/applicationset_controller.go 60.39% <0.00%> (-0.11%) ⬇️

... and 1 file with indirect coverage changes

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

Copy link
Contributor

@wmgroot wmgroot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This LGTM.

@blakepettersson
Copy link
Member

Is there a way to do an E2E test to verify that the Application isn't jumping from Healthy -> Degraded -> Healthy with this change? Otherwise this LGTM

@ericblackburn
Copy link
Contributor Author

Is there a way to do an E2E test to verify that the Application isn't jumping from Healthy -> Degraded -> Healthy with this change? Otherwise this LGTM

I tried to move all the content in this parent progressive sync is On block to its own function and write up unit tests, but I ran out of time. There are just no unit test for this area, so I would have to sit down and design that from scratch. Given my time limitations, I decided to just do the one line fix.

Eventually, I want to dedicate more time to bettering progressive sync functionality and add more unit testing. But, it would be a while until I can do that. I can push up a branch to my fork, if someone wants to take a look at my failed attempt at unit testing and tune it up.

@ericblackburn ericblackburn requested a review from a team as a code owner September 20, 2023 20:56
@thober35
Copy link

Hi @blakepettersson,
any chance this could get approved and merged? Seeing a lot of performance impact regarding health status flapping.
Thank you!

Copy link
Member

@crenshaw-dev crenshaw-dev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@crenshaw-dev crenshaw-dev merged commit 614a253 into argoproj:master Oct 16, 2023
@crenshaw-dev
Copy link
Member

/cherry-pick release-2.9

@crenshaw-dev
Copy link
Member

/cherry-pick release-2.8

@crenshaw-dev
Copy link
Member

/cherry-pick release-2.7

@crenshaw-dev
Copy link
Member

/cherry-pick release-2.6

@gcp-cherry-pick-bot
Copy link

Cherry-pick failed with Merge error 614a2531b0177b63d8887751fbe1f086dd416581 into temp-cherry-pick-06efef-release-2.6

crenshaw-dev pushed a commit that referenced this pull request Oct 16, 2023
…using it (#15299) (#15990)

Signed-off-by: Eric Blackburn <eblackburn@indeed.com>
Co-authored-by: ericblackburn <eblackburn@indeed.com>
crenshaw-dev pushed a commit that referenced this pull request Oct 16, 2023
…using it (#15299) (#15991)

Signed-off-by: Eric Blackburn <eblackburn@indeed.com>
Co-authored-by: ericblackburn <eblackburn@indeed.com>
crenshaw-dev pushed a commit that referenced this pull request Oct 16, 2023
…using it (#15299) (#15992)

Signed-off-by: Eric Blackburn <eblackburn@indeed.com>
Co-authored-by: ericblackburn <eblackburn@indeed.com>
ymktmk pushed a commit to ymktmk/argo-cd that referenced this pull request Oct 29, 2023
…using it (argoproj#15299)

Signed-off-by: Eric Blackburn <eblackburn@indeed.com>
jmilic1 pushed a commit to jmilic1/argo-cd that referenced this pull request Nov 13, 2023
…using it (argoproj#15299)

Signed-off-by: Eric Blackburn <eblackburn@indeed.com>
Signed-off-by: jmilic1 <70441727+jmilic1@users.noreply.github.com>
vladfr pushed a commit to vladfr/argo-cd that referenced this pull request Dec 13, 2023
…using it (argoproj#15299)

Signed-off-by: Eric Blackburn <eblackburn@indeed.com>
tesla59 pushed a commit to tesla59/argo-cd that referenced this pull request Dec 16, 2023
…using it (argoproj#15299)

Signed-off-by: Eric Blackburn <eblackburn@indeed.com>
lukaszgyg pushed a commit to lukaszgyg/argo-cd that referenced this pull request Jan 12, 2024
…using it (argoproj#15299)

Signed-off-by: Eric Blackburn <eblackburn@indeed.com>
Hariharasuthan99 pushed a commit to AmadeusITGroup/argo-cd that referenced this pull request Jun 16, 2024
…using it (argoproj#15299)

Signed-off-by: Eric Blackburn <eblackburn@indeed.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bug: Progressive Sync is processing and altering ApplicationSets that aren't using Progressive Sync
5 participants