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 sidecarset inject annotations abnormal #1101

Merged
merged 1 commit into from
Oct 14, 2022

Conversation

zmberg
Copy link
Member

@zmberg zmberg commented Oct 14, 2022

Signed-off-by: liheng.zms [email protected]

Ⅰ. Describe what this PR does

fix sidecarset inject annotations abnormal:

  1. If the sidecarSet is not injected for the first time or re-injected into the sidecar cosntainer, there is no need to update annotations
  2. When a Pod contains multiple hot upgrade containers, the current logic will override annotations [kruise.io/sidecarset-working-hotupgrade-container]

@kruise-bot kruise-bot requested review from Fei-Guo and FillZpp October 14, 2022 02:10
@kruise-bot kruise-bot added the size/M size/M: 30-99 label Oct 14, 2022
@codecov-commenter
Copy link

Codecov Report

Merging #1101 (04be59c) into master (c5b63fa) will decrease coverage by 0.07%.
The diff coverage is 88.00%.

@@            Coverage Diff             @@
##           master    #1101      +/-   ##
==========================================
- Coverage   49.33%   49.26%   -0.08%     
==========================================
  Files         137      137              
  Lines       19288    19298      +10     
==========================================
- Hits         9516     9507       -9     
- Misses       8724     8738      +14     
- Partials     1048     1053       +5     
Flag Coverage Δ
unittests 49.26% <88.00%> (-0.08%) ⬇️

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

Impacted Files Coverage Δ
pkg/webhook/pod/mutating/sidecarset.go 68.80% <86.95%> (+0.12%) ⬆️
pkg/webhook/pod/mutating/sidecarset_hotupgrade.go 100.00% <100.00%> (ø)
pkg/controller/cloneset/cloneset_controller.go 52.94% <0.00%> (-3.93%) ⬇️
pkg/controller/uniteddeployment/revision.go 65.95% <0.00%> (-1.07%) ⬇️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@zmberg zmberg force-pushed the fix_sidecarset_annotations branch from 04be59c to 3db4229 Compare October 14, 2022 07:02
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

@FillZpp
Copy link
Member

FillZpp commented Oct 14, 2022

/approve

@kruise-bot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: FillZpp

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 e97f7e7 into openkruise:master Oct 14, 2022
@zmberg zmberg deleted the fix_sidecarset_annotations branch October 14, 2022 07:22
baxiaoshi pushed a commit to baxiaoshi/kruise that referenced this pull request Nov 21, 2022
Signed-off-by: peng.xin <[email protected]>

optimize workloadspread when suitable subset maxReplicas is niil (openkruise#1066)

Signed-off-by: mingzhou.swx <[email protected]>

Signed-off-by: mingzhou.swx <[email protected]>
Co-authored-by: mingzhou.swx <[email protected]>

Optimize performance of LabelSelector conversion (openkruise#1068)

Signed-off-by: FillZpp <[email protected]>

Signed-off-by: FillZpp <[email protected]>

Support timezone for AdvancedCronJob (openkruise#1070)

Signed-off-by: FillZpp <[email protected]>

Signed-off-by: FillZpp <[email protected]>

ignore if pod condition has been updated (openkruise#1074)

Signed-off-by: mingzhou.swx <[email protected]>

Signed-off-by: mingzhou.swx <[email protected]>
Co-authored-by: mingzhou.swx <[email protected]>

pod probe marker apis (openkruise#1073)

* pod probe marker apis

Signed-off-by: liheng.zms <[email protected]>

* fix statefulset truncateHistory panic

Signed-off-by: liheng.zms <[email protected]>

Signed-off-by: liheng.zms <[email protected]>

pod probe marker controller (openkruise#1075)

Signed-off-by: liheng.zms <[email protected]>

Signed-off-by: liheng.zms <[email protected]>

consider whether patch field is matched when assign existing pods to subset (openkruise#1083)

Signed-off-by: mingzhou.swx <[email protected]>

Signed-off-by: mingzhou.swx <[email protected]>
Co-authored-by: mingzhou.swx <[email protected]>

pod probe marker webhook (openkruise#1078)

Signed-off-by: liheng.zms <[email protected]>

Signed-off-by: liheng.zms <[email protected]>

sidecarset support pods ns(kube-system, kube-public) (openkruise#1084)

Signed-off-by: liheng.zms <[email protected]>

Signed-off-by: liheng.zms <[email protected]>

pod probe marker proposal (openkruise#1053)

Signed-off-by: liheng.zms <[email protected]>

Signed-off-by: liheng.zms <[email protected]>

node pod probe daemon (openkruise#1077)

Signed-off-by: liheng.zms <[email protected]>

sidecarset support patch pod metadata proposal (openkruise#993)

Signed-off-by: liheng.zms <[email protected]>

Support predownload image in ads (openkruise#1057)

Signed-off-by: Abner <[email protected]>

* support predownload image for ads

Add PreDownloadImageForDaemonSetUpdate featureGate (openkruise#1093)

Signed-off-by: FillZpp <[email protected]>

Signed-off-by: FillZpp <[email protected]>

Add changelog for v1.3.0 (openkruise#1092)

Signed-off-by: liheng.zms <[email protected]>

Signed-off-by: liheng.zms <[email protected]>

fix sidecarset inject annotations abnormal (openkruise#1101)

Signed-off-by: liheng.zms <[email protected]>

Signed-off-by: liheng.zms <[email protected]>

fix InPlaceUpdateEnvFromMetadata bug (openkruise#1108)

Co-authored-by: 郭已钦 <[email protected]>

support uniteddeployment persistentVolumeClaimRetentionPolicy inherit from  advancestatefulset template (openkruise#1110)

Signed-off-by: cheyuexian <[email protected]>

Signed-off-by: cheyuexian <[email protected]>
Co-authored-by: cheyuexian <[email protected]>

Add PreNormal Lifecycle Hook for CloneSet (openkruise#1071)

* add pre-normal(pre-available) hook

Signed-off-by: mingzhou.swx <[email protected]>

* add pre-normal(pre-available) hook

Signed-off-by: mingzhou.swx <[email protected]>

Signed-off-by: mingzhou.swx <[email protected]>
Co-authored-by: mingzhou.swx <[email protected]>

partition support float percent (openkruise#1124)

Signed-off-by: shiyan2016 <[email protected]>

Signed-off-by: shiyan2016 <[email protected]>

improve error hanlding of inplace update env from metadata (openkruise#1125)

Signed-off-by: mingzhou.swx <[email protected]>

Signed-off-by: mingzhou.swx <[email protected]>
Co-authored-by: mingzhou.swx <[email protected]>

pub support to configure Evict,Delete,Update Operation (openkruise#1126)

Signed-off-by: liheng.zms <[email protected]>

Signed-off-by: liheng.zms <[email protected]>

feat: add watch whitelist

feat: add watch whitelist

add watch whitelist check

add dynamic watch option

feat: add persistent annotations

format

feat: add pps support custom workload

Signed-off-by: peng.xin <[email protected]>

fix: nodeSelector and nodeAffinity have not been modified

Signed-off-by: peng.xin <[email protected]>

fix: error string

Signed-off-by: peng.xin <[email protected]>

fix: error string

Signed-off-by: peng.xin <[email protected]>

fix: goimports

Signed-off-by: peng.xin <[email protected]>

refactor: refactoring ersistentPodAnnotations type

Signed-off-by: peng.xin <[email protected]>

- add statefulet group check
- modify the pod create processing logic

Signed-off-by: peng.xin <[email protected]>

refactor: pps watch of whitelist workload

Signed-off-by: peng.xin <[email protected]>

fix: add statefulsetlike's pod controller

Signed-off-by: peng.xin <[email protected]>
@zmberg zmberg added this to the v1.4 milestone Feb 14, 2023
@zmberg zmberg added the kind/bug Something isn't working label Feb 14, 2023
ppbits pushed a commit to ppbits/kruise that referenced this pull request Apr 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved kind/bug Something isn't working lgtm size/M size/M: 30-99
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants