Skip to content

Added unschedulable and network-unavailable toleration.#64954

Merged
k8s-github-robot merged 1 commit intokubernetes:masterfrom
k82cn:k8s_61312_2
Sep 10, 2018
Merged

Added unschedulable and network-unavailable toleration.#64954
k8s-github-robot merged 1 commit intokubernetes:masterfrom
k82cn:k8s_61312_2

Conversation

@k82cn
Copy link
Copy Markdown
Contributor

@k82cn k82cn commented Jun 11, 2018 •
edited
Loading

Signed-off-by: Da K. Ma klaus1982.cn@gmail.com

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
part of #61312
fixes: #67606

Release note:

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

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jun 11, 2018
@k82cn
Copy link
Copy Markdown
Contributor Author

k82cn commented Jun 11, 2018

/sig apps

@k8s-ci-robot k8s-ci-robot added the sig/apps Categorizes an issue or PR as relevant to SIG Apps. label Jun 11, 2018
@k82cn
Copy link
Copy Markdown
Contributor Author

k82cn commented Jun 11, 2018

In #61312, TaintNodeNetworkUnavailable should be added by user when TaintNodesByCondition enabled. For DaemonSet controller, this PR add it automatically to keep the behviour consistent.

@k82cn
Copy link
Copy Markdown
Contributor Author

k82cn commented Jun 12, 2018

/assign @janetkuo
/unassign @kow3ns

@k8s-ci-robot k8s-ci-robot assigned janetkuo and unassigned kow3ns Jun 12, 2018
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 24, 2018
@k82cn k82cn force-pushed the k8s_61312_2 branch 2 times, most recently from b5938f9 to f4be9e7 Compare June 24, 2018 02:47
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 24, 2018
@k82cn
Copy link
Copy Markdown
Contributor Author

k82cn commented Jun 24, 2018

/retest

bsalamat
bsalamat reviewed Jun 27, 2018
View reviewed changes
Copy link
Copy Markdown
Member

@bsalamat bsalamat left a comment

Choose a reason for hiding this comment

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

Could you please add a test to ensure that the tolerations are added properly?

@k82cn
Copy link
Copy Markdown
Contributor Author

k82cn commented Jun 28, 2018

Could you please add a test to ensure that the tolerations are added properly?

Sure :)

@k82cn k82cn mentioned this pull request Jul 16, 2018
Closed
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 17, 2018
@k82cn
Copy link
Copy Markdown
Contributor Author

k82cn commented Jul 23, 2018

/retest

@k82cn
Copy link
Copy Markdown
Contributor Author

k82cn commented Jul 23, 2018

Added integration test, PTAL :)

@k82cn
Copy link
Copy Markdown
Contributor Author

k82cn commented Jul 24, 2018

/retest

@Huang-Wei Huang-Wei mentioned this pull request Jul 27, 2018
Closed
8 tasks
@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 11, 2018
@Huang-Wei Huang-Wei mentioned this pull request Sep 6, 2018
Merged
@k82cn k82cn mentioned this pull request Sep 6, 2018
Merged
janetkuo
janetkuo reviewed Sep 7, 2018
View reviewed changes
pkg/controller/daemon/daemon_controller.go Outdated
Copy link
Copy Markdown
Member

@janetkuo janetkuo Sep 7, 2018

Choose a reason for hiding this comment

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

Shouldn't it be just kubelettypes.IsCriticalPod(newPod)?

Copy link
Copy Markdown
Contributor Author

@k82cn k82cn Sep 7, 2018

Choose a reason for hiding this comment

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

yes !

janetkuo
janetkuo reviewed Sep 7, 2018
View reviewed changes
test/integration/daemonset/daemonset_test.go Outdated
Copy link
Copy Markdown
Member

@janetkuo janetkuo Sep 7, 2018

Choose a reason for hiding this comment

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

Remove "avoid race condition" because we just simulate to avoid the need to start nodelifecycle controller.

Copy link
Copy Markdown
Contributor Author

@k82cn k82cn Sep 7, 2018

Choose a reason for hiding this comment

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

done!

janetkuo
janetkuo reviewed Sep 7, 2018
View reviewed changes
test/integration/daemonset/daemonset_test.go Outdated
Copy link
Copy Markdown
Member

@janetkuo janetkuo Sep 7, 2018

Choose a reason for hiding this comment

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

Same here

Copy link
Copy Markdown
Contributor Author

@k82cn k82cn Sep 7, 2018

Choose a reason for hiding this comment

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

done!

janetkuo
janetkuo reviewed Sep 7, 2018
View reviewed changes
pkg/controller/daemon/daemon_controller_test.go Outdated
Copy link
Copy Markdown
Member

@janetkuo janetkuo Sep 7, 2018

Choose a reason for hiding this comment

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

Check error

Copy link
Copy Markdown
Contributor Author

@k82cn k82cn Sep 7, 2018

Choose a reason for hiding this comment

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

oh, sorry for the miss; and done :)

Copy link
Copy Markdown
Contributor Author

@k82cn k82cn Sep 7, 2018

Choose a reason for hiding this comment

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

also go through the whole file and updated :)

@k82cn
Added unschedulable and network-unavailable toleration.
e39b510 
Signed-off-by: Da K. Ma <klaus1982.cn@gmail.com>
@Huang-Wei
Copy link
Copy Markdown
Member

Huang-Wei commented Sep 7, 2018

/retest

1 similar comment
@Huang-Wei
Copy link
Copy Markdown
Member

Huang-Wei commented Sep 7, 2018

/retest

@janetkuo
Copy link
Copy Markdown
Member

janetkuo commented Sep 10, 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 10, 2018
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Sep 10, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bsalamat, janetkuo, k82cn, mikedanese, ravisantoshgudimetla

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-github-robot
Copy link
Copy Markdown

k8s-github-robot commented Sep 10, 2018

/test all [submit-queue is verifying that this PR is safe to merge]

@k82cn
Copy link
Copy Markdown
Contributor Author

k82cn commented Sep 10, 2018

/sig scheduling

@k8s-ci-robot k8s-ci-robot added the sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. label Sep 10, 2018
@k8s-github-robot
Copy link
Copy Markdown

k8s-github-robot commented Sep 10, 2018

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md.

@k8s-github-robot k8s-github-robot merged commit 323e137 into kubernetes:master Sep 10, 2018
@k82cn k82cn deleted the k8s_61312_2 branch September 10, 2018 02:47
@tpepper
Copy link
Copy Markdown

tpepper commented Sep 10, 2018

This PR appears to have caused a conformance regression:
a4df698...323e137
https://k8s-testgrid.appspot.com/sig-release-master-blocking#Conformance%20-%20GCE

@k82cn
Copy link
Copy Markdown
Contributor Author

k82cn commented Sep 10, 2018

:( i will check it

@k82cn k82cn mentioned this pull request Sep 11, 2018
Merged
@k82cn
Copy link
Copy Markdown
Contributor Author

k82cn commented Sep 12, 2018

The latest test is green now (https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/logs/ci-kubernetes-gce-conformance/620) after #68494 merged.

This was referenced Sep 12, 2018
Closed
Closed
Merged
k8s-ci-robot added a commit that referenced this pull request Sep 14, 2018
@k8s-ci-robot
Merge pull request #68601 from k82cn/automated-cherry-pick-of-#66082-#…
ed30179 
…64954-#68494-upstream-release-1.11

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.
@marpaia marpaia mentioned this pull request Sep 20, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mikedanese mikedanese Awaiting requested review from mikedanese

4 more reviewers

@Huang-Wei Huang-Wei Huang-Wei left review comments

@janetkuo janetkuo janetkuo approved these changes

@ravisantoshgudimetla ravisantoshgudimetla ravisantoshgudimetla approved these changes

@bsalamat bsalamat bsalamat approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@janetkuo janetkuo

@ravisantoshgudimetla ravisantoshgudimetla

@bsalamat bsalamat

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. 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. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. 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

v1.12

Development

Successfully merging this pull request may close these issues.

Failing test: broad scheduling issues due to TaintNodesByCondition