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

feat: retry with client side dry run if server one was failed #548

Conversation

pasha-codefresh
Copy link
Member

@pasha-codefresh pasha-codefresh commented Oct 31, 2023

Fixes for #547
Closes: argoproj/argo-cd#16177

Signed-off-by: pashakostohrys <pavel@codefresh.io>
Copy link

codecov bot commented Oct 31, 2023

Codecov Report

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

Comparison is base (4a5648e) 54.70% compared to head (4d77a0d) 54.65%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #548      +/-   ##
==========================================
- Coverage   54.70%   54.65%   -0.05%     
==========================================
  Files          41       41              
  Lines        4645     4647       +2     
==========================================
- Hits         2541     2540       -1     
- Misses       1908     1910       +2     
- Partials      196      197       +1     
Files Coverage Δ
pkg/sync/sync_context.go 74.00% <82.60%> (-0.28%) ⬇️

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

@pasha-codefresh
Copy link
Member Author

Tested with 1.24 and 1.25 cluster

Signed-off-by: pashakostohrys <pavel@codefresh.io>
…' into feat/server-side-dry-run-fallback

# Conflicts:
#	pkg/sync/sync_context.go
Signed-off-by: pashakostohrys <pavel@codefresh.io>
Copy link

sonarcloud bot commented Oct 31, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@crenshaw-dev crenshaw-dev merged commit c0c2dd1 into argoproj:master Nov 2, 2023
5 checks passed
anandf added a commit to anandf/gitops-engine that referenced this pull request Jan 19, 2024
anandf added a commit to anandf/gitops-engine that referenced this pull request Jan 19, 2024
…argoproj#548)"

This reverts commit c0c2dd1.

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>
leoluz added a commit that referenced this pull request Jan 22, 2024
…idation even with server side apply (#564)

* Revert "feat: retry with client side dry run if server one was failed (#548)"

This reverts commit c0c2dd1.

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>

* Revert "fix(server): use server side dry run in case if it is server side apply (#546)"

This reverts commit 4a5648e.

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>

* Fixed the logic to disable server side apply if it is a dry run

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>

* Added more values in the log message for better debugging

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>

* Fixed compilation error

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>

* Written an inline fn to get string value of dry-run strategy

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>

* Added comment as requested with reference to the issue number

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>

---------

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>
Co-authored-by: Leonardo Luz Almeida <leoluz@users.noreply.github.com>
nerdeveloper pushed a commit to nerdeveloper/gitops-engine that referenced this pull request May 13, 2024
…oj#548)

* feat: retry with client side dry run if server one was failed

Signed-off-by: pashakostohrys <pavel@codefresh.io>

* feat: retry with client side dry run if server one was failed

Signed-off-by: pashakostohrys <pavel@codefresh.io>

* feat: retry with client side dry run if server one was failed

Signed-off-by: pashakostohrys <pavel@codefresh.io>

---------

Signed-off-by: pashakostohrys <pavel@codefresh.io>
Signed-off-by: Obinna Odirionye <odirionye@gmail.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.

Synchronization triggers both PostSync and SyncFail events even on successful sync
2 participants