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: sync-options annotation with Force=true (#414) #560

Merged
merged 1 commit into from
Apr 16, 2024

Conversation

kkk777-7
Copy link
Contributor

@kkk777-7 kkk777-7 commented Dec 9, 2023

This PR implements #414, argoproj/argo-cd#5882

Changes:

  • Add new annotation argocd.argoproj.io/sync-options: Force=true

Related: #526

Copy link

codecov bot commented Dec 9, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 54.66%. Comparing base (5fd9f44) to head (bba3871).
Report is 2 commits behind head on master.

❗ Current head bba3871 differs from pull request most recent head a463a21. Consider uploading reports for the commit a463a21 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #560      +/-   ##
==========================================
- Coverage   54.71%   54.66%   -0.05%     
==========================================
  Files          41       41              
  Lines        4834     4648     -186     
==========================================
- Hits         2645     2541     -104     
+ Misses       1977     1910      -67     
+ Partials      212      197      -15     

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

Copy link

sonarcloud bot commented Dec 9, 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 2 Code Smells

No Coverage information No Coverage information
27.5% 27.5% Duplication

@jmgilman
Copy link

Any chance this can get merged soon?

@douglasday
Copy link

Also interested in seeing this merged

@faust64
Copy link

faust64 commented Feb 19, 2024

It's now been almost two years since we're waiting for that fix ( #414 )
Is there anyone to review that PR?!

@alexec @alexmt @jannfis @jessesuen @mayzhang2000 ?

@pasha-codefresh
Copy link
Member

@kkk777-7 , i am really sorry for long review on it, could you please solve conflicts ?

Signed-off-by: kkk777-7 <kota.kimura0725@gmail.com>
Copy link

sonarcloud bot commented Apr 16, 2024

Quality Gate Passed Quality Gate passed

Issues
2 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
4.5% Duplication on New Code

See analysis details on SonarCloud

@kkk777-7
Copy link
Contributor Author

@pasha-codefresh , thank you reply! I resolved conflict.

Copy link
Member

@pasha-codefresh pasha-codefresh left a comment

Choose a reason for hiding this comment

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

LGTM, thank you! Please let me know if any help needed with update gitops-engine inside argocd

@pasha-codefresh pasha-codefresh merged commit fbecbb8 into argoproj:master Apr 16, 2024
3 checks passed
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.

None yet

5 participants