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.

Sign up for GitHub

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

Jump to bottom

fix: conflict on updates to revision #3216

Merged
merged 9 commits into from
Dec 7, 2023
Merged

fix: conflict on updates to revision #3216

merged 9 commits into from
Dec 7, 2023

Conversation

zachaller
Copy link
Collaborator

@zachaller zachaller commented Dec 5, 2023 •
edited
Loading

fixes: #3218

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 5, 2023 •
edited
Loading

Go Published Test Results

2 089 tests   2 089 ✔️  2m 49s ⏱️
   118 suites         0 💤
       1 files           0 ❌

Results for commit 6ebd29e.

♻️ This comment has been updated with latest results.

@zachaller
fix: possibly fix conflict on updates to revision
b33374a 
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 5, 2023 •
edited
Loading

E2E Tests Published Test Results

    4 files      4 suites   3h 29m 35s ⏱️
106 tests   96 ✔️   6 💤   4 ❌
436 runs  400 ✔️ 24 💤 12 ❌

For more details on these failures, see this check.

Results for commit 6ebd29e.

♻️ This comment has been updated with latest results.

@zachaller
wip
b4dd8ff 
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
@zachaller
Merge branch 'master' of github.com:argoproj/argo-rollouts into fix-r…
f619532 
…evision-update-conflict
@zachaller
fix one test
3dc0d07 
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
@zachaller
fix tests
d78b549 
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
@zachaller
cleanup
99bcbfe 
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
@zachaller
change order
dbcb41f 
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
@codecov Codecov
Copy link

codecov bot commented Dec 6, 2023 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (d378ce7) 81.81% compared to head (55b127c) 81.81%.
Report is 4 commits behind head on master.

❗ Current head 55b127c differs from pull request most recent head 6ebd29e. Consider uploading reports for the commit 6ebd29e to get more accurate results

Additional details and impacted files 
@@           Coverage Diff           @@
##           master    #3216   +/-   ##
=======================================
  Coverage   81.81%   81.81%           
=======================================
  Files         135      135           
  Lines       20625    20627    +2     
=======================================
+ Hits        16874    16876    +2     
  Misses       2880     2880           
  Partials      871      871

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

@zachaller
change order to match reality
55b127c 
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
@zachaller zachaller changed the title fix: possibly fix conflict on updates to revision fix: conflict on updates to revision Dec 7, 2023
@zachaller
add comments on exptected actions
6ebd29e 
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Dec 7, 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

@zachaller zachaller marked this pull request as ready for review December 7, 2023 16:14
jessesuen
jessesuen approved these changes Dec 7, 2023
View reviewed changes
Copy link
Member

@jessesuen jessesuen left a comment

Choose a reason for hiding this comment

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

Ah such a simple fix to solve such an annoying problem. Thank you!

@zachaller zachaller merged commit 1305129 into master Dec 7, 2023
22 checks passed
@zachaller zachaller deleted the fix-revision-update-conflict branch December 7, 2023 22:58
ashutosh16 pushed a commit to ashutosh16/argo-rollouts that referenced this pull request Dec 8, 2023
@zachaller @ashutosh16
fix: conflict on updates to replicaset revision (argoproj#3216)
ff614e5 
* fix: possibly fix conflict on updates to revision

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* wip

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* fix one test

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* fix tests

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* cleanup

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* change order

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* change order to match reality

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* add comments on exptected actions

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

---------

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Signed-off-by: ashutosh16 <11219262+ashutosh16@users.noreply.github.com>
emily-blixt-ck pushed a commit to emily-blixt-ck/argo-rollouts that referenced this pull request Dec 8, 2023
@zachaller @emily-blixt-ck
fix: conflict on updates to replicaset revision (argoproj#3216)
ab5d0e6 
* fix: possibly fix conflict on updates to revision

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* wip

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* fix one test

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* fix tests

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* cleanup

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* change order

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* change order to match reality

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* add comments on exptected actions

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

---------

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
zachaller added a commit that referenced this pull request Dec 11, 2023
@zachaller
fix: conflict on updates to replicaset revision (#3216)
eaaef38 
* fix: possibly fix conflict on updates to revision

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* wip

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* fix one test

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* fix tests

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* cleanup

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* change order

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* change order to match reality

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

* add comments on exptected actions

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

---------

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
@zachaller zachaller added the cherry-pick-completed Used once we have cherry picked the PR to all requested releases label Jan 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jessesuen jessesuen jessesuen approved these changes

Assignees
No one assigned
Labels
cherry-pick/release-1.6 cherry-pick-completed Used once we have cherry picked the PR to all requested releases
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Replicaset Conflict
2 participants
@zachaller @jessesuen