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

update logic of adding default DS pod tolerations #67036

Merged
merged 1 commit into from
Nov 30, 2018
Merged

update logic of adding default DS pod tolerations #67036

merged 1 commit into from
Nov 30, 2018

Conversation

Huang-Wei
Copy link
Member

@Huang-Wei Huang-Wei commented Aug 6, 2018 •
edited
Loading

What this PR does / why we need it:

  • update DS pod default tolerations: add PIDPressure, remove OutOfDisk
  • remove useless tolerations testcases

Which issue(s) this PR fixes:

Special notes for your reviewer:

Correct the behavior of daemonset controller as "out-of-disk" toleration doesn't fit any more.

Release note:

`node.kubernetes.io/pid-pressure` toleration is added for DaemonSet pods, and `node.kubernetes.io/out-of-disk` isn't added any more even if it's a critical pod.

/sig scheduling
/sig apps

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. sig/apps Categorizes an issue or PR as relevant to SIG Apps. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 6, 2018
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 6, 2018
@Huang-Wei
Copy link
Member Author

/assign @mikedanese @k82cn

@Huang-Wei Huang-Wei mentioned this pull request Aug 6, 2018
Merged
@MHBauer
Copy link
Contributor

MHBauer commented Aug 6, 2018

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 6, 2018
@Huang-Wei
Copy link
Member Author

/retest

@Huang-Wei
Copy link
Member Author

Friendly ping @k82cn @mikedanese :)

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 16, 2018
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 16, 2018
@Huang-Wei
Copy link
Member Author

@janetkuo @mikedanese Could you kindly review this PR?

It's a (small) behavior fix on default daemonset pods:

  • remove OutOfDisk toleration (as OutOfDisk condition/taint has been removed in sig/node side for more than 2 releases)
  • add PIDPressure toleration

@k82cn
Copy link
Member

k82cn commented Aug 16, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 16, 2018
@k82cn
Copy link
Member

k82cn commented Aug 21, 2018

ping @mikedanese , PTAL :)

@Huang-Wei
Copy link
Member Author

/retest

1 similar comment
@Huang-Wei
Copy link
Member Author

/retest

@Huang-Wei
Copy link
Member Author

Friendly ping @mikedanese @janetkuo PTAL

@Huang-Wei Huang-Wei mentioned this pull request Sep 2, 2018
Merged
@k82cn
Copy link
Member

k82cn commented Sep 6, 2018

@janetkuo , I think we'd better to get this merged in 1.12 :)

@Huang-Wei
Copy link
Member Author

@k82cn thanks for bringing this up.
This PR is very likely to need rebase (due to PR #64954) and minor code changes. If @janetkuo thinks it's a 1.12 candidate, I will rebase this one as soon as #64954 is merged.

@k8s-ci-robot k8s-ci-robot added sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Sep 10, 2018
@Huang-Wei
Copy link
Member Author

Code rebased. @k82cn PTAL.

k82cn
k82cn reviewed Sep 10, 2018
View reviewed changes
pkg/controller/daemon/util/daemonset_util.go Outdated
@@ -120,11 +108,7 @@ func AddOrUpdateDaemonPodTolerations(spec *v1.PodSpec, isCritical bool) {
func CreatePodTemplate(ns string, template v1.PodTemplateSpec, generation *int64, hash string) v1.PodTemplateSpec {
Copy link
Member

Choose a reason for hiding this comment

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

also remove ns string here :)

Copy link
Member Author

Choose a reason for hiding this comment

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

I did see a reminder in one of the comments, but forgot...

Done.

@Huang-Wei
Copy link
Member Author

/retest

2 similar comments
@Huang-Wei
Copy link
Member Author

/retest

@Huang-Wei
Copy link
Member Author

/retest

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 12, 2018
@k82cn
Copy link
Member

k82cn commented Sep 26, 2018

LGTM, for 1.13, please help to rebase :)

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 27, 2018
@Huang-Wei
Copy link
Member Author

@mikedanese @janetkuo could you kindly take a look at the Daemonset part?

@Huang-Wei
Copy link
Member Author

Friendly ping @mikedanese @janetkuo :)

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 16, 2018
@k82cn k82cn mentioned this pull request Nov 7, 2018
Merged
@k82cn
Copy link
Member

k82cn commented Nov 29, 2018

@Huang-Wei , would you help to rebase this PR? I'd like to get this merged in 1.14 :)

@Huang-Wei
update logic of adding default DS pod tolerations
ad6e361 
- update DS pod default tolerations: add PIDPressure, remove OutOfDisk
- remove useless tolerations testcases
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 29, 2018
@Huang-Wei
Copy link
Member Author

@k82cn rebased. PTAL.

@Huang-Wei
Copy link
Member Author

/retest

@k82cn
Copy link
Member

k82cn commented Nov 30, 2018

/lgtm
/approve

We're going to remove OutOfDisk in #67037 :)

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 30, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Huang-Wei, k82cn

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 30, 2018
@k8s-ci-robot k8s-ci-robot merged commit 550f620 into kubernetes:master Nov 30, 2018
@Huang-Wei Huang-Wei deleted the update-ds-pod-tolerations branch November 30, 2018 03:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@k82cn k82cn k82cn left review comments

@aveshagarwal aveshagarwal Awaiting requested review from aveshagarwal

@mikedanese mikedanese Awaiting requested review from mikedanese

Assignees

@mikedanese mikedanese

@k82cn k82cn

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Huang-Wei @MHBauer @k82cn @k8s-ci-robot @mikedanese