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

sidecarset support patch pod metadata proposal #993

Merged
merged 1 commit into from
Sep 27, 2022

Conversation

zmberg
Copy link
Member

@zmberg zmberg commented Jun 15, 2022

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

Ⅰ. Describe what this PR does

Some sidecar containers may require special configurations that take effect via annotations/labels. Thus, sidecarSet should support inject or in-place update these configurations.

User Story:

  • log-agent sidecar container inject pod annotation[oom-score]='{"log-agent": 1}' to set sidecar oom score.

@kruise-bot kruise-bot requested review from Fei-Guo and FillZpp June 15, 2022 08:21
@kruise-bot kruise-bot added the size/L size/L: 100-499 label Jun 15, 2022
@zmberg zmberg requested review from furykerry and removed request for Fei-Guo June 20, 2022 03:30
@zmberg zmberg force-pushed the sidecarset-annotations-proposal branch from 70593ff to b0f022e Compare June 20, 2022 04:04

// IgnorePatchPolicy indicates if PatchPodFields conflicts with Pod,
// will ignore PatchPodFields, and keep the corresponding fields of pods.
IgnorePatchPolicy PatchPolicyType = "Ignore"
Copy link
Member

Choose a reason for hiding this comment

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

Ignore -> Retain

@zmberg zmberg force-pushed the sidecarset-annotations-proposal branch from b0f022e to 10c6d1b Compare June 22, 2022 03:11
@zmberg zmberg changed the title sidecarset support patch pod metadata sidecarset support patch pod metadata proposal Jun 24, 2022
Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>
@zmberg zmberg force-pushed the sidecarset-annotations-proposal branch from 10c6d1b to d7ee280 Compare August 10, 2022 06:57
@codecov-commenter
Copy link

Codecov Report

Merging #993 (d7ee280) into master (2319654) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #993   +/-   ##
=======================================
  Coverage   49.34%   49.34%           
=======================================
  Files         125      125           
  Lines       12355    12355           
=======================================
  Hits         6096     6096           
  Misses       5320     5320           
  Partials      939      939           
Flag Coverage Δ
unittests 49.34% <ø> (ø)

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

📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more

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

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

@FillZpp FillZpp merged commit f46097d into openkruise:master Sep 27, 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
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