feat: Prune resources in reverse of sync wave order #538

svghadi · 2023-09-03T15:56:57Z

This PR implements argoproj/argo-cd#15074 enhancement to prune resources in reverse order of sync waves.

Changes:

Adds reordering logic which swaps waves between resources marked for pruning such that resources with high syncwave value is deleted first before resources with lower syncwave value.
Adds wait till the pruned resource is actually cleaned up from the cluster before moving to next wave.
Updates prune last logic to also consider prune tasks to determine last wave.

Related: argoproj/argo-cd#12376

codecov · 2023-09-03T16:02:30Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (aba3819) 54.47% compared to head (382d57b) 54.76%.

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #538      +/-   ##
==========================================
+ Coverage   54.47%   54.76%   +0.29%     
==========================================
  Files          41       41              
  Lines        4793     4824      +31     
==========================================
+ Hits         2611     2642      +31     
  Misses       1969     1969              
  Partials      213      213

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

drpaneas · 2023-09-04T08:26:41Z

What happens when:

You have a deployment of 3 pods (1,2,3) with equiv waves (1,2,3)
You set a finalizer on pod-2, so it cannot be deleted.
You ask ArgoCD to delete and prune this deployment.

Can you run this experiment? If your code is correct, only pod-3 should have been deleted.

sonarcloud · 2023-09-04T11:06:59Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
0.0% Duplication

svghadi · 2023-09-04T11:23:46Z

Thanks @drpaneas . Your test scenario helped find a bug in my implementation. I updated the logic to use waveOverride var instead of directly patching live obj. It is now working as expected.

syncwave-prune-order-test.mov

drpaneas · 2023-09-04T12:52:35Z

Thanks @drpaneas . Your test scenario helped find a bug in my implementation. I updated the logic to use waveOverride var instead of directly patching live obj. It is now working as expected.

Hehe, great ;)

/lgtm

anandf · 2023-10-19T04:33:18Z

/lgtm

jgato · 2023-11-27T14:24:27Z

how is this feature progressing? do we have any plan on which version would be included?

sonarcloud · 2023-11-30T06:18:11Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
0.0% Duplication

xmj · 2023-12-06T09:43:59Z

@anandf @drpaneas maybe /lgtm wasn't enough.
Says now At least 1 approving review is required to merge this pull request.

svghadi · 2023-12-06T09:51:33Z

@crenshaw-dev - Could you please take a look at this PR when you have some time? Thank you.

vl-kp · 2023-12-20T02:18:03Z

Any timeline to merge this PR?

svghadi · 2023-12-20T04:41:20Z

I have discussed the changes with maintainers on one of the call. Currently working on an e2e test to test the integration with Argo CD. Should be good to merge in next few weeks 🤞.

Signed-off-by: Siddhesh Ghadi <[email protected]>

Directly patching live objs results into incorrect wave ordering as the new wave value from live obj is used to perform reordering during next sync Signed-off-by: Siddhesh Ghadi <[email protected]>

sonarcloud · 2024-01-04T06:08:33Z

Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
2.5% Duplication on New Code

See analysis details on SonarCloud

svghadi · 2024-01-04T14:30:25Z

Hi @crenshaw-dev, as discussed previously, I have added docs & a e2e test to test the integration with Argo CD in argoproj/argo-cd#16748. The CI is passing.

Is there anything else required to get this in?

ishitasequeira

/lgtm

svghadi · 2024-01-17T06:32:39Z

Thanks @ishitasequeira. Anything else required for merge?

svghadi · 2024-01-24T06:47:20Z

I have updated the argoproj/argo-cd#16748 PR to bring this change in ArgoCD. Please take a look. Thanks.

* Prune resources in reverse of sync wave order Signed-off-by: Siddhesh Ghadi <[email protected]> * Use waveOverride var instead of directly patching live obj Directly patching live objs results into incorrect wave ordering as the new wave value from live obj is used to perform reordering during next sync Signed-off-by: Siddhesh Ghadi <[email protected]> --------- Signed-off-by: Siddhesh Ghadi <[email protected]> Signed-off-by: Justin Marquis <[email protected]>

* Prune resources in reverse of sync wave order * Use waveOverride var instead of directly patching live obj Directly patching live objs results into incorrect wave ordering as the new wave value from live obj is used to perform reordering during next sync --------- Signed-off-by: Siddhesh Ghadi <[email protected]> Signed-off-by: Justin Marquis <[email protected]> Co-authored-by: Siddhesh Ghadi <[email protected]>

svghadi force-pushed the syncwave branch 2 times, most recently from e81753e to 3540566 Compare September 3, 2023 16:09

drpaneas approved these changes Sep 4, 2023

View reviewed changes

anandf approved these changes Oct 19, 2023

View reviewed changes

svghadi mentioned this pull request Nov 27, 2023

Sync-waves not working as expected argoproj/argo-cd#12376

Closed

3 tasks

svghadi force-pushed the syncwave branch from 1ef9e93 to 42c693b Compare November 30, 2023 06:17

svghadi added 2 commits January 4, 2024 11:37

Prune resources in reverse of sync wave order

0ef379d

Signed-off-by: Siddhesh Ghadi <[email protected]>

Use waveOverride var instead of directly patching live obj

382d57b

Directly patching live objs results into incorrect wave ordering as the new wave value from live obj is used to perform reordering during next sync Signed-off-by: Siddhesh Ghadi <[email protected]>

svghadi force-pushed the syncwave branch from 42c693b to 382d57b Compare January 4, 2024 06:08

svghadi mentioned this pull request Jan 4, 2024

feat: Prune resources in reverse order of syncwave during sync (#15074) argoproj/argo-cd#16748

Merged

14 tasks

ishitasequeira approved these changes Jan 9, 2024

View reviewed changes

ishitasequeira merged commit 5fd9f44 into argoproj:master Jan 24, 2024
4 checks passed

svghadi deleted the syncwave branch January 24, 2024 05:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Prune resources in reverse of sync wave order #538

feat: Prune resources in reverse of sync wave order #538

svghadi commented Sep 3, 2023

codecov bot commented Sep 3, 2023 •

edited

Loading

drpaneas commented Sep 4, 2023

sonarcloud bot commented Sep 4, 2023

svghadi commented Sep 4, 2023

drpaneas commented Sep 4, 2023

anandf commented Oct 19, 2023

jgato commented Nov 27, 2023

sonarcloud bot commented Nov 30, 2023

xmj commented Dec 6, 2023

svghadi commented Dec 6, 2023

vl-kp commented Dec 20, 2023

svghadi commented Dec 20, 2023

sonarcloud bot commented Jan 4, 2024

svghadi commented Jan 4, 2024

ishitasequeira left a comment

svghadi commented Jan 17, 2024

svghadi commented Jan 24, 2024

feat: Prune resources in reverse of sync wave order #538

feat: Prune resources in reverse of sync wave order #538

Conversation

svghadi commented Sep 3, 2023

codecov bot commented Sep 3, 2023 • edited Loading

Codecov Report

drpaneas commented Sep 4, 2023

sonarcloud bot commented Sep 4, 2023

svghadi commented Sep 4, 2023

drpaneas commented Sep 4, 2023

anandf commented Oct 19, 2023

jgato commented Nov 27, 2023

sonarcloud bot commented Nov 30, 2023

xmj commented Dec 6, 2023

svghadi commented Dec 6, 2023

vl-kp commented Dec 20, 2023

svghadi commented Dec 20, 2023

sonarcloud bot commented Jan 4, 2024

Quality Gate passed

svghadi commented Jan 4, 2024

ishitasequeira left a comment

Choose a reason for hiding this comment

svghadi commented Jan 17, 2024

svghadi commented Jan 24, 2024

codecov bot commented Sep 3, 2023 •

edited

Loading