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

SidecarSet add upgrade state in pod annotation #1349

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SidecarSet add upgrade state in pod annotation #1349

wants to merge 1 commit into from

Conversation

xiangpingjiang
Copy link
Contributor

Ⅰ. Describe what this PR does

Ⅱ. Does this pull request fix one issue?

fixes #1312

Ⅲ. Describe how to verify it

Ⅳ. Special notes for reviews

@sonatype-lift
Copy link

sonatype-lift bot commented Jul 28, 2023

Sonatype Lift is retiring

Sonatype Lift will be retiring on Sep 12, 2023, with its analysis stopping on Aug 12, 2023. We understand that this news may come as a disappointment, and Sonatype is committed to helping you transition off it seamlessly. If you’d like to retain your data, please export your issues from the web console.
We are extremely grateful and thank you for your support over the years.

📖 Read about the impacts and timeline

@kruise-bot kruise-bot added the size/L size/L: 100-499 label Jul 28, 2023
@codecov-commenter
Copy link

codecov-commenter commented Jul 28, 2023 •
edited by codecov bot

Codecov Report

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

Project coverage is 49.87%. Comparing base (4e35a1d) to head (40103b6).
Report is 61 commits behind head on master.

Files Patch % Lines
pkg/control/sidecarcontrol/util.go 2.63% 37 Missing ⚠️
pkg/controller/sidecarset/sidecarset_processor.go 57.44% 16 Missing and 4 partials ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #1349      +/-   ##
==========================================
+ Coverage   48.60%   49.87%   +1.26%     
==========================================
  Files         152      160       +8     
  Lines       21333    24759    +3426     
==========================================
+ Hits        10369    12348    +1979     
- Misses       9828    11172    +1344     
- Partials     1136     1239     +103
Flag Coverage Δ
unittests 49.87% <38.70%> (+1.26%) ⬆️

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.

@kruise-bot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign zmberg for approval by writing /assign @zmberg in a comment. For more information see:The Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@xiangpingjiang xiangpingjiang marked this pull request as draft August 20, 2023 02:04
@kruise-bot kruise-bot added size/M size/M: 30-99 size/L size/L: 100-499 and removed size/L size/L: 100-499 size/M size/M: 30-99 labels Aug 20, 2023
@kruise-bot kruise-bot added size/M size/M: 30-99 and removed size/L size/L: 100-499 labels Aug 20, 2023
@kruise-bot kruise-bot added size/L size/L: 100-499 and removed size/M size/M: 30-99 labels Aug 20, 2023
@xiangpingjiang xiangpingjiang marked this pull request as ready for review August 20, 2023 14:16
@xiangpingjiang xiangpingjiang marked this pull request as draft August 20, 2023 15:12
@xiangpingjiang
SidecarSet add upgrade state in pod annotation
40103b6 
Signed-off-by: pingjiang <xiangpingjiang1998@gmail.com>
@xiangpingjiang xiangpingjiang marked this pull request as ready for review August 20, 2023 15:50
hantmac
hantmac reviewed Aug 21, 2023
View reviewed changes
pkg/controller/sidecarset/sidecarset_processor.go
@@ -103,6 +103,13 @@ func (p *Processor) UpdateSidecarSet(sidecarSet *appsv1alpha1.SidecarSet) (recon
return reconcile.Result{RequeueAfter: time.Second}, nil
}

// check if pod finish sidecar container upgrade
for _, pod := range pods {
Copy link
Member

Choose a reason for hiding this comment

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

Maybe we should make updatePodsSidecarHashState after line-99 because some pods that already ready should be update state to Noamal.

pkg/controller/sidecarset/sidecarset_processor.go
@@ -189,6 +196,53 @@ func (p *Processor) updatePods(control sidecarcontrol.SidecarControl, pods []*co
return nil
}

func (p *Processor) updatePodSidecarHashState(control sidecarcontrol.SidecarControl, pod *corev1.Pod) error {
Copy link
Member

Choose a reason for hiding this comment

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

Need some e2e tests?

@stale Stale
Copy link

stale bot commented Nov 19, 2023

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the wontfix This will not be worked on label Nov 19, 2023
@stale stale bot closed this Nov 26, 2023
@xiangpingjiang
Copy link
Contributor Author

/open

@zmberg zmberg reopened this Mar 7, 2024
@stale stale bot removed the wontfix This will not be worked on label Mar 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hantmac hantmac hantmac left review comments

@Fei-Guo Fei-Guo Awaiting requested review from Fei-Guo

@zmberg zmberg Awaiting requested review from zmberg

@FillZpp FillZpp Awaiting requested review from FillZpp

@furykerry furykerry Awaiting requested review from furykerry

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
size/L size/L: 100-499
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[feature request] SidecarSet add upgrade state in pod annotation
5 participants
@xiangpingjiang @codecov-commenter @kruise-bot @hantmac @zmberg