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: updates to replicas and pod template at the same time causes rollout to get stuck #3272

Merged
merged 3 commits into from Jan 2, 2024
Merged

fix: updates to replicas and pod template at the same time causes rollout to get stuck #3272

merged 3 commits into from Jan 2, 2024

Conversation

zachaller
Copy link
Collaborator

@zachaller zachaller commented Dec 21, 2023 •
edited

fixes: #3256

The rollout status is updated here

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 21, 2023 •
edited

Go Published Test Results

2 093 tests   2 093 ✅  2m 49s ⏱️
  118 suites      0 💤
    1 files        0 ❌

Results for commit 085cb4b.

♻️ This comment has been updated with latest results.

@codecov Codecov
Copy link

codecov bot commented Dec 21, 2023 •
edited

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (ede86a8) 81.83% compared to head (085cb4b) 81.83%.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master    #3272   +/-   ##
=======================================
  Coverage   81.83%   81.83%           
=======================================
  Files         135      135           
  Lines       20629    20633    +4     
=======================================
+ Hits        16881    16885    +4     
  Misses       2877     2877           
  Partials      871      871

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

@zachaller zachaller changed the title Fixreplicapodchangetogether status fix: updates to rs and pod template cause rollout to get stuck Dec 21, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 21, 2023 •
edited

E2E Tests Published Test Results

  4 files    4 suites   3h 27m 5s ⏱️
106 tests  95 ✅  6 💤 5 ❌
434 runs  401 ✅ 24 💤 9 ❌

For more details on these failures, see this check.

Results for commit 085cb4b.

♻️ This comment has been updated with latest results.

@zachaller zachaller changed the title fix: updates to rs and pod template cause rollout to get stuck fix: updates to replicas and pod template at the same time causes rollout to get stuck Dec 21, 2023
@andyliuliming
Copy link
Contributor

andyliuliming commented Dec 23, 2023 •
edited

this works! when will this merge? @zachaller

@zachaller zachaller mentioned this pull request Dec 27, 2023
Closed
@andyliuliming
Copy link
Contributor

@zachaller when will this be merged?
will it be backported to 1.6?
thanks.

andyliuliming and others added 3 commits December 29, 2023 09:01
@andyliuliming @zachaller
fix: fix the rollout stuck when pod/replicas changed together or cana…
eec9bb4 
…ry strategy.

Signed-off-by: Liming Liu <andyliuliming@outlook.com>
@andyliuliming @zachaller
add one unit test case for empty canary service.
48a109d 
Signed-off-by: Liming Liu <andyliuliming@outlook.com>
@zachaller
use rollout status to get the replicaset hash instead of service
085cb4b 
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
@zachaller zachaller force-pushed the fixreplicapodchangetogether-status branch from b10e305 to 085cb4b Compare December 29, 2023 15:01
@zachaller zachaller marked this pull request as ready for review December 29, 2023 15:01
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Dec 29, 2023

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

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

See analysis details on SonarCloud

leoluz
leoluz approved these changes Jan 2, 2024
View reviewed changes
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 192009a into argoproj:master Jan 2, 2024
23 checks passed
zachaller added a commit that referenced this pull request Jan 2, 2024
@zachaller @andyliuliming
fix: updates to replicas and pod template at the same time causes rol…
c226865 
…lout to get stuck (#3272)

* fix: fix the rollout stuck when pod/replicas changed together or canary strategy.

Signed-off-by: Liming Liu <andyliuliming@outlook.com>

* add one unit test case for empty canary service.

Signed-off-by: Liming Liu <andyliuliming@outlook.com>

* use rollout status to get the replicaset hash instead of service

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

---------

Signed-off-by: Liming Liu <andyliuliming@outlook.com>
Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>
Co-authored-by: Liming Liu <andyliuliming@outlook.com>
@zachaller zachaller added the cherry-pick-completed Used once we have cherry picked the PR to all requested releases label Jan 2, 2024
@eugenepaniot eugenepaniot mentioned this pull request Jan 18, 2024
Open
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@leoluz leoluz leoluz 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
3 participants
@zachaller @andyliuliming @leoluz