Skip to content

Automated cherry pick of #66082: move feature gate checks inside IsCriticalPod #64954: Added unschedulable and network-unavailable toleration. #68494: Added default tolerations for new pods.#68601

Merged
k8s-ci-robot merged 3 commits intokubernetes:release-1.11from
k82cn:automated-cherry-pick-of-#66082-#64954-#68494-upstream-release-1.11
Sep 14, 2018
Merged

Conversation

@k82cn
Copy link
Copy Markdown
Contributor

@k82cn k82cn commented Sep 13, 2018 •
edited
Loading

Cherry pick of #66082 #64954 #68494 on release-1.11.

#66082: move feature gate checks inside IsCriticalPod
#64954: Added unschedulable and network-unavailable toleration.
#68494: Added default tolerations for new pods.

Release note:

If `TaintNodesByCondition` is enabled, add `node.kubernetes.io/unschedulable` and `node.kubernetes.io/network-unavailable` automatically to DaemonSet pods.

sjenning and others added 3 commits September 13, 2018 11:27
@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Sep 13, 2018
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 13, 2018
@k82cn
Copy link
Copy Markdown
Contributor Author

k82cn commented Sep 13, 2018

/sig scheduling
/sig apps
/sig nodes
/kind bug

@k8s-ci-robot k8s-ci-robot added sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. sig/apps Categorizes an issue or PR as relevant to SIG Apps. kind/bug Categorizes issue or PR as related to a bug. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Sep 13, 2018
@k82cn
Copy link
Copy Markdown
Contributor Author

k82cn commented Sep 13, 2018

/assign @janetkuo for #64954 , #68494 cherrypick
/assign @derekwaynecarr for #66082 cherrypick

@k82cn k82cn mentioned this pull request Sep 13, 2018
Closed
@k82cn
Copy link
Copy Markdown
Contributor Author

k82cn commented Sep 13, 2018

/sig node

@k8s-ci-robot k8s-ci-robot added the sig/node Categorizes an issue or PR as relevant to SIG Node. label Sep 13, 2018
@janetkuo
Copy link
Copy Markdown
Member

janetkuo commented Sep 13, 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 Sep 13, 2018
@derekwaynecarr
Copy link
Copy Markdown
Member

derekwaynecarr commented Sep 13, 2018

/approve

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Sep 13, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekwaynecarr, janetkuo, k82cn

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 Sep 13, 2018
@tpepper
Copy link
Copy Markdown

tpepper commented Sep 13, 2018

/milestone v1.11

@k8s-ci-robot k8s-ci-robot added this to the v1.11 milestone Sep 13, 2018
@foxish foxish added cherrypick-candidate cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Sep 13, 2018
@k8s-ci-robot k8s-ci-robot merged commit ed30179 into kubernetes:release-1.11 Sep 14, 2018
@k82cn k82cn deleted the automated-cherry-pick-of-#66082-#64954-#68494-upstream-release-1.11 branch September 14, 2018 00:34
@k82cn k82cn mentioned this pull request Sep 20, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dims dims Awaiting requested review from dims

@lukaszo lukaszo Awaiting requested review from lukaszo

2 more reviewers

@tao12345666333 tao12345666333 tao12345666333 approved these changes

@janetkuo janetkuo janetkuo approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@janetkuo janetkuo

@derekwaynecarr derekwaynecarr

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. 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/node Categorizes an issue or PR as relevant to SIG Node. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

v1.11

Development

Successfully merging this pull request may close these issues.

8 participants

@k82cn @janetkuo @derekwaynecarr @k8s-ci-robot @tpepper @tao12345666333 @foxish @sjenning