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

WorkloadSpread consider whether patch field is matched when assign existing pods to subset #1083

Merged
merged 1 commit into from
Sep 23, 2022

Conversation

veophi
Copy link
Member

@veophi veophi commented Sep 21, 2022

…subset

Signed-off-by: mingzhou.swx mingzhou.swx@alibaba-inc.com

Ⅰ. Describe what this PR does

WorkloadSpread consider whether patch field is matched when assign existing pods to subset

preferredScore = 100 * schedulePreferredScore + 10 * patchPreferredScore + quotaScore

patchPreferredScore ++ if subset.patch.annotations or subset.patch.labels is matched with pod's.

@furykerry
Copy link
Member

/lgtm

…subset

Signed-off-by: mingzhou.swx <mingzhou.swx@alibaba-inc.com>
@codecov-commenter
Copy link

Codecov Report

Merging #1083 (5b16625) into master (4edba53) will decrease coverage by 0.42%.
The diff coverage is 81.81%.

@@            Coverage Diff             @@
##           master    #1083      +/-   ##
==========================================
- Coverage   50.24%   49.82%   -0.43%     
==========================================
  Files         126      131       +5     
  Lines       17839    18550     +711     
==========================================
+ Hits         8964     9242     +278     
- Misses       7887     8283     +396     
- Partials      988     1025      +37     
Flag Coverage Δ
unittests 49.82% <81.81%> (-0.43%) ⬇️

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

Impacted Files Coverage Δ
.../workloadspread/workloadspread_controller_utils.go 83.33% <76.47%> (-4.01%) ⬇️
...roller/workloadspread/workloadspread_controller.go 63.52% <100.00%> (-0.16%) ⬇️
...ler/podprobemarker/podprobemarker_event_handler.go 0.00% <0.00%> (ø)
...troller/nodepodprobe/nodepodprobe_event_handler.go 0.00% <0.00%> (ø)
...ntroller/nodepodprobe/node_pod_probe_controller.go 59.29% <0.00%> (ø)
pkg/util/finalizer.go 0.00% <0.00%> (ø)
...ller/podprobemarker/pod_probe_marker_controller.go 52.68% <0.00%> (ø)
pkg/controller/statefulset/stateful_set_control.go 63.90% <0.00%> (+0.32%) ⬆️
pkg/controller/daemonset/daemonset_update.go 58.28% <0.00%> (+0.92%) ⬆️
... and 1 more

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

Copy link
Member

@FillZpp FillZpp left a comment

Choose a reason for hiding this comment

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

/lgtm

@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 5a890f1 into openkruise:master Sep 23, 2022
baxiaoshi pushed a commit to baxiaoshi/kruise that referenced this pull request Nov 21, 2022
Signed-off-by: peng.xin <peng.xin@ly.com>

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

Signed-off-by: mingzhou.swx <mingzhou.swx@alibaba-inc.com>

Signed-off-by: mingzhou.swx <mingzhou.swx@alibaba-inc.com>
Co-authored-by: mingzhou.swx <mingzhou.swx@alibaba-inc.com>

Optimize performance of LabelSelector conversion (openkruise#1068)

Signed-off-by: FillZpp <FillZpp.pub@gmail.com>

Signed-off-by: FillZpp <FillZpp.pub@gmail.com>

Support timezone for AdvancedCronJob (openkruise#1070)

Signed-off-by: FillZpp <FillZpp.pub@gmail.com>

Signed-off-by: FillZpp <FillZpp.pub@gmail.com>

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

Signed-off-by: mingzhou.swx <mingzhou.swx@alibaba-inc.com>

Signed-off-by: mingzhou.swx <mingzhou.swx@alibaba-inc.com>
Co-authored-by: mingzhou.swx <mingzhou.swx@alibaba-inc.com>

pod probe marker apis (openkruise#1073)

* pod probe marker apis

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

* fix statefulset truncateHistory panic

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

pod probe marker controller (openkruise#1075)

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

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

Signed-off-by: mingzhou.swx <mingzhou.swx@alibaba-inc.com>

Signed-off-by: mingzhou.swx <mingzhou.swx@alibaba-inc.com>
Co-authored-by: mingzhou.swx <mingzhou.swx@alibaba-inc.com>

pod probe marker webhook (openkruise#1078)

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

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

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

pod probe marker proposal (openkruise#1053)

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

node pod probe daemon (openkruise#1077)

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

sidecarset support patch pod metadata proposal (openkruise#993)

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

Support predownload image in ads (openkruise#1057)

Signed-off-by: Abner <abner199709@gmail.com>

* support predownload image for ads

Add PreDownloadImageForDaemonSetUpdate featureGate (openkruise#1093)

Signed-off-by: FillZpp <FillZpp.pub@gmail.com>

Signed-off-by: FillZpp <FillZpp.pub@gmail.com>

Add changelog for v1.3.0 (openkruise#1092)

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

fix sidecarset inject annotations abnormal (openkruise#1101)

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

fix InPlaceUpdateEnvFromMetadata bug (openkruise#1108)

Co-authored-by: 郭已钦 <xiangyang2@xiaohongshu.com>

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

Signed-off-by: cheyuexian <cheyuexian@bilibili.com>

Signed-off-by: cheyuexian <cheyuexian@bilibili.com>
Co-authored-by: cheyuexian <cheyuexian@bilibili.com>

Add PreNormal Lifecycle Hook for CloneSet (openkruise#1071)

* add pre-normal(pre-available) hook

Signed-off-by: mingzhou.swx <mingzhou.swx@alibaba-inc.com>

* add pre-normal(pre-available) hook

Signed-off-by: mingzhou.swx <mingzhou.swx@alibaba-inc.com>

Signed-off-by: mingzhou.swx <mingzhou.swx@alibaba-inc.com>
Co-authored-by: mingzhou.swx <mingzhou.swx@alibaba-inc.com>

partition support float percent (openkruise#1124)

Signed-off-by: shiyan2016 <shiyan20160606@gmail.com>

Signed-off-by: shiyan2016 <shiyan20160606@gmail.com>

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

Signed-off-by: mingzhou.swx <mingzhou.swx@alibaba-inc.com>

Signed-off-by: mingzhou.swx <mingzhou.swx@alibaba-inc.com>
Co-authored-by: mingzhou.swx <mingzhou.swx@alibaba-inc.com>

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

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

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 <peng.xin@ly.com>

fix: nodeSelector and nodeAffinity have not been modified

Signed-off-by: peng.xin <peng.xin@ly.com>

fix: error string

Signed-off-by: peng.xin <peng.xin@ly.com>

fix: error string

Signed-off-by: peng.xin <peng.xin@ly.com>

fix: goimports

Signed-off-by: peng.xin <peng.xin@ly.com>

refactor: refactoring ersistentPodAnnotations type

Signed-off-by: peng.xin <peng.xin@ly.com>

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

Signed-off-by: peng.xin <peng.xin@ly.com>

refactor: pps watch of whitelist workload

Signed-off-by: peng.xin <peng.xin@ly.com>

fix: add statefulsetlike's pod controller

Signed-off-by: peng.xin <peng.xin@ly.com>
ppbits pushed a commit to ppbits/kruise that referenced this pull request Apr 4, 2024
…subset (openkruise#1083)

Co-authored-by: mingzhou.swx <mingzhou.swx@alibaba-inc.com>
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