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 the issue of incorrect batch id labeling in partition style release if previous pod re-created #246

Merged
merged 1 commit into from
Dec 27, 2024

Conversation

myname4423
Copy link
Contributor

Ⅰ. Describe what this PR does

  1. Fix the issue of incorrect batch id labeling in partition style release if previous pod re-created. This PR also consider the rollback-in-batch scene where labeling is a little complicated.
  2. Fix some deprecated library function call incidentally

Ⅱ. Does this pull request fix one issue?

Ⅲ. Special notes for reviews

@myname4423 myname4423 force-pushed the fix branch 2 times, most recently from 56c6149 to dab50b5 Compare December 13, 2024 09:34
Copy link

codecov bot commented Dec 13, 2024

Codecov Report

Attention: Patch coverage is 40.58172% with 429 lines in your changes missing coverage. Please review.

Project coverage is 44.99%. Comparing base (056c77d) to head (dab50b5).

Files with missing lines Patch % Lines
pkg/util/patch/patch_utils.go 0.00% 93 Missing ⚠️
...ebhook/workload/mutating/unified_update_handler.go 20.75% 74 Missing and 10 partials ⚠️
pkg/controller/batchrelease/control/util.go 0.00% 75 Missing ⚠️
...lease/control/bluegreenstyle/deployment/control.go 68.09% 30 Missing and 22 partials ⚠️
...release/control/bluegreenstyle/cloneset/control.go 69.30% 19 Missing and 12 partials ⚠️
...g/controller/batchrelease/batchrelease_executor.go 13.63% 19 Missing ⚠️
...ler/batchrelease/control/bluegreenstyle/hpa/hpa.go 64.81% 10 Missing and 9 partials ⚠️
pkg/controller/batchrelease/labelpatch/patcher.go 61.36% 12 Missing and 5 partials ⚠️
pkg/util/condition.go 0.00% 13 Missing ⚠️
pkg/controller/rollout/rollout_progressing.go 10.00% 6 Missing and 3 partials ⚠️
... and 6 more
Additional details and impacted files
@@            Coverage Diff             @@
##           master     #246      +/-   ##
==========================================
- Coverage   45.55%   44.99%   -0.57%     
==========================================
  Files          57       61       +4     
  Lines        6395     7026     +631     
==========================================
+ Hits         2913     3161     +248     
- Misses       2989     3318     +329     
- Partials      493      547      +54     
Flag Coverage Δ
unittests 44.99% <40.58%> (-0.57%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

@myname4423 myname4423 force-pushed the fix branch 2 times, most recently from 8041ab3 to 61203ae Compare December 18, 2024 09:18
@myname4423 myname4423 force-pushed the fix branch 2 times, most recently from c29a4d8 to dbcf7c3 Compare December 25, 2024 07:14
@myname4423 myname4423 force-pushed the fix branch 2 times, most recently from 24c1bf8 to b522bee Compare December 25, 2024 08:30
@zmberg
Copy link
Member

zmberg commented Dec 25, 2024

/lgtm

pkg/controller/batchrelease/labelpatch/patcher.go Outdated Show resolved Hide resolved
pkg/controller/batchrelease/labelpatch/patcher.go Outdated Show resolved Hide resolved
Replicas: 10,
Batches: []v1beta1.ReleaseBatch{
Copy link
Member

Choose a reason for hiding this comment

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

plz add cases for more than one batches

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

pkg/controller/batchrelease/context/context.go Outdated Show resolved Hide resolved
Copy link
Member

@furykerry furykerry left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@furykerry furykerry merged commit 5bbbc04 into openkruise:master Dec 27, 2024
23 of 24 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.

5 participants