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(controller): Fix for rollouts getting stuck in loop #2689

Merged

Conversation

zachaller
Copy link
Collaborator

@zachaller zachaller commented Mar 31, 2023

@zachaller zachaller mentioned this pull request Mar 31, 2023
2 tasks
@github-actions
Copy link
Contributor

github-actions bot commented Mar 31, 2023

Go Published Test Results

1 948 tests   1 948 ✔️  2m 36s ⏱️
   118 suites         0 💤
       1 files           0

Results for commit fa42e3d.

♻️ This comment has been updated with latest results.

@codecov
Copy link

codecov bot commented Mar 31, 2023

Codecov Report

Patch coverage: 100.00% and no project coverage change.

Comparison is base (cc78ac5) 81.47% compared to head (fa42e3d) 81.48%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #2689   +/-   ##
=======================================
  Coverage   81.47%   81.48%           
=======================================
  Files         133      133           
  Lines       20154    20159    +5     
=======================================
+ Hits        16421    16426    +5     
  Misses       2881     2881           
  Partials      852      852           
Impacted Files Coverage Δ
rollout/controller.go 81.74% <100.00%> (+0.15%) ⬆️

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@github-actions
Copy link
Contributor

github-actions bot commented Mar 31, 2023

E2E Tests Published Test Results

    4 files      4 suites   3h 26m 29s ⏱️
  96 tests   85 ✔️   5 💤 6
390 runs  364 ✔️ 20 💤 6

For more details on these failures, see this check.

Results for commit fa42e3d.

♻️ This comment has been updated with latest results.

Copy link
Member

@agrawroh agrawroh left a comment

Choose a reason for hiding this comment

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

Do we have enough coverage around this? Can we maybe add a few Unit/Integration tests? It'd be good to see if we can repro the behavior seen in the linked ticket without this fix and show that it's no longer an issue with this patch.

It looks like the right thing to do but I'm not sure if we'll end up uncovering some other subtle bug by changing this order.

@zachaller
Copy link
Collaborator Author

zachaller commented Apr 3, 2023

Do we have enough coverage around this? Can we maybe add a few Unit/Integration tests? It'd be good to see if we can repro the behavior seen in the linked ticket without this fix and show that it's no longer an issue with this patch.

It looks like the right thing to do but I'm not sure if we'll end up uncovering some other subtle bug by changing this order.

I want to try to add tests around this I just am not sure I will be able to the unit test it, fakeclient is not accurate enough for unit tests to work possibly, and I am worried about how to simulate it in e2e but I plan on trying both especially if I can get some confirmation that it does in deed seem to fix the issue. I agree though that getting a reproducible test would be ideal. I did hack together some code to test this locally but it involved editing rollouts controller to do a double update.

Signed-off-by: zachaller <zachaller@users.noreply.github.com>
Signed-off-by: zachaller <zachaller@users.noreply.github.com>
Signed-off-by: zachaller <zachaller@users.noreply.github.com>
Signed-off-by: zachaller <zachaller@users.noreply.github.com>
@zachaller zachaller force-pushed the fix-possible-solution-to-stuck-rollout branch from 5c1b63f to fa42e3d Compare April 28, 2023 15:39
@zachaller zachaller requested a review from leoluz April 28, 2023 15:40
@sonarqubecloud
Copy link

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
3.5% 3.5% Duplication

Copy link
Contributor

@leoluz leoluz left a comment

Choose a reason for hiding this comment

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

LGTM

@zachaller zachaller merged commit cb4d6ff into argoproj:master May 1, 2023
@zachaller zachaller added cherry-pick-completed Used once we have cherry picked the PR to all requested releases and removed cherry-pick/release-1.3 cherry-pick/release-1.4 labels May 5, 2023
zachaller added a commit that referenced this pull request May 5, 2023
* possible fix for sutck rollouts

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

* add comments

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

* add comments

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

* update comments

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

---------

Signed-off-by: zachaller <zachaller@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick/release-1.5 cherry-pick-completed Used once we have cherry picked the PR to all requested releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rollout got stuck
3 participants