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: pod-readiness-controller use Patch to modify Pod instead of Update #1560

Merged
merged 1 commit into from
Apr 23, 2024

Conversation

BruceAko
Copy link
Contributor

@BruceAko BruceAko commented Apr 2, 2024

Ⅰ. Describe what this PR does

#1557

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how to verify it

Ⅳ. Special notes for reviews

@kruise-bot kruise-bot requested review from Fei-Guo and zmberg April 2, 2024 14:59
@kruise-bot
Copy link

Welcome @BruceAko! It looks like this is your first PR to openkruise/kruise 🎉

@kruise-bot kruise-bot added the size/S size/S 10-29 label Apr 2, 2024
Copy link

codecov bot commented Apr 2, 2024

Codecov Report

Attention: Patch coverage is 81.25000% with 3 lines in your changes are missing coverage. Please review.

Project coverage is 47.98%. Comparing base (0d0031a) to head (64e4385).
Report is 20 commits behind head on master.

❗ Current head 64e4385 differs from pull request most recent head 19fb84c. Consider uploading reports for the commit 19fb84c to get more accurate results

Files Patch % Lines
...ontroller/podreadiness/pod_readiness_controller.go 81.25% 2 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1560      +/-   ##
==========================================
+ Coverage   47.91%   47.98%   +0.06%     
==========================================
  Files         162      162              
  Lines       23491    23501      +10     
==========================================
+ Hits        11256    11277      +21     
+ Misses      11014    11007       -7     
+ Partials     1221     1217       -4     
Flag Coverage Δ
unittests 47.98% <81.25%> (+0.06%) ⬆️

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.

@BruceAko BruceAko marked this pull request as draft April 2, 2024 15:43
@BruceAko BruceAko marked this pull request as ready for review April 2, 2024 15:57
@kruise-bot kruise-bot requested review from FillZpp and veophi April 2, 2024 15:57
@BruceAko BruceAko marked this pull request as draft April 2, 2024 16:08
@BruceAko BruceAko closed this Apr 2, 2024
@BruceAko BruceAko reopened this Apr 2, 2024
@BruceAko BruceAko marked this pull request as ready for review April 2, 2024 17:07
@kruise-bot kruise-bot requested a review from furykerry April 2, 2024 17:07
@BruceAko
Copy link
Contributor Author

BruceAko commented Apr 3, 2024

@furykerry PTAL

})
return r.Status().Update(context.TODO(), pod)
// patch pod condition
status := v1.PodStatus{
Copy link
Member

Choose a reason for hiding this comment

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

It is not necessary to use the RetryOnConflict method when using the patch method.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is it ok now?

Signed-off-by: BruceAko <chongzhi@hust.edu.cn>
@kruise-bot kruise-bot added size/M size/M: 30-99 and removed size/S size/S 10-29 labels Apr 7, 2024
@BruceAko BruceAko requested a review from zmberg April 7, 2024 08:24
@BruceAko BruceAko closed this Apr 7, 2024
@BruceAko BruceAko reopened this Apr 7, 2024
@BruceAko BruceAko closed this Apr 7, 2024
@BruceAko BruceAko reopened this Apr 7, 2024
@BruceAko
Copy link
Contributor Author

BruceAko commented Apr 8, 2024

/assign @zmberg

@furykerry
Copy link
Member

/lgtm

@BruceAko
Copy link
Contributor Author

/assign @Fei-Guo

@BruceAko
Copy link
Contributor Author

@zmberg @furykerry @Fei-Guo Can this pull request be merged now?

@zmberg
Copy link
Member

zmberg commented Apr 23, 2024

/approve

@kruise-bot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zmberg

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kruise-bot kruise-bot merged commit 5cf50f7 into openkruise:master Apr 23, 2024
83 of 86 checks passed
ABNER-1 pushed a commit to ABNER-1/kruise that referenced this pull request Apr 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants