Added unschedulable and network-unavailable toleration. #64954

k82cn · 2018-06-11T06:28:42Z

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.

k82cn · 2018-06-11T06:29:50Z

/sig apps

k82cn · 2018-06-11T06:35:09Z

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 · 2018-06-12T00:21:01Z

/assign @janetkuo
/unassign @kow3ns

k82cn · 2018-06-24T05:42:09Z

/retest

bsalamat

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

k82cn · 2018-06-28T06:56:42Z

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

Sure :)

k82cn · 2018-07-23T09:04:11Z

/retest

k82cn · 2018-07-23T09:05:05Z

Added integration test, PTAL :)

k82cn · 2018-07-24T01:03:01Z

/retest

janetkuo · 2018-09-07T01:10:15Z

pkg/controller/daemon/daemon_controller.go

-		})
-	}
+	isCritical := utilfeature.DefaultFeatureGate.Enabled(features.ExperimentalCriticalPodAnnotation) &&
+		kubelettypes.IsCriticalPod(newPod)


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

janetkuo · 2018-09-07T01:12:16Z

test/integration/daemonset/daemonset_test.go

+			node := newNode("unschedulable-node", nil)
+			node.Spec.Unschedulable = true
+			// If ScheduleDaemonSetPods enabled, simulate TaintsNodeByCondition to avoid
+			// race condition.


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

janetkuo · 2018-09-07T01:12:25Z

test/integration/daemonset/daemonset_test.go

+			}
+
+			// If ScheduleDaemonSetPods enabled, simulate TaintsNodeByCondition to avoid
+			// race condition.


janetkuo · 2018-09-07T01:16:07Z

pkg/controller/daemon/daemon_controller_test.go

+	enabled := utilfeature.DefaultFeatureGate.Enabled(features.ExperimentalCriticalPodAnnotation)
+	defer func() {
+		utilfeature.DefaultFeatureGate.Set(fmt.Sprintf("%s=%t",
+			features.ExperimentalCriticalPodAnnotation, enabled))


Check error

oh, sorry for the miss; and done :)

also go through the whole file and updated :)

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

Huang-Wei · 2018-09-07T17:57:31Z

/retest

Huang-Wei · 2018-09-07T19:07:57Z

/retest

janetkuo · 2018-09-10T01:41:12Z

/lgtm

k8s-ci-robot · 2018-09-10T01:41:19Z

[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

Needs approval from an approver in each of these files:

~~pkg/controller/daemon/OWNERS~~ [janetkuo,mikedanese]
~~test/integration/daemonset/OWNERS~~ [janetkuo,mikedanese]

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 · 2018-09-10T01:42:31Z

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

k82cn · 2018-09-10T01:58:23Z

/sig scheduling

k8s-github-robot · 2018-09-10T02:46:36Z

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.

tpepper · 2018-09-10T20:49:58Z

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

k82cn · 2018-09-10T22:41:25Z

:( i will check it

k82cn · 2018-09-12T00:53:21Z

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

…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.

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

k8s-ci-robot requested review from janetkuo and mikedanese June 11, 2018 06:28

k82cn force-pushed the k8s_61312_2 branch from 27330ea to cc9d0de Compare June 11, 2018 06:29

k8s-ci-robot added the sig/apps Categorizes an issue or PR as relevant to SIG Apps. label Jun 11, 2018

mikedanese assigned bsalamat and kow3ns Jun 11, 2018

k8s-ci-robot assigned janetkuo and unassigned kow3ns Jun 12, 2018

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 force-pushed the k8s_61312_2 branch 2 times, most recently from b5938f9 to f4be9e7 Compare June 24, 2018 02:47

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 24, 2018

bsalamat reviewed Jun 27, 2018

View reviewed changes

k82cn mentioned this pull request Jul 16, 2018

Add network unavailable toleration to the Pod using host network #61312

Closed

k82cn force-pushed the k8s_61312_2 branch from f4be9e7 to c0d32ff Compare July 17, 2018 10:21

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

Huang-Wei mentioned this pull request Jul 27, 2018

Promote ScheduleDaemonSetPods to Beta in 1.12 #66526

Closed

8 tasks

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 mentioned this pull request Sep 6, 2018

update logic of adding default DS pod tolerations #67036

Merged

k82cn mentioned this pull request Sep 6, 2018

docs update to promote ScheduleDaemonSetPods to beta kubernetes/website#9923

Merged

janetkuo reviewed Sep 7, 2018

View reviewed changes

k82cn force-pushed the k8s_61312_2 branch from 248c6b4 to 27204aa Compare September 7, 2018 02:29

Added unschedulable and network-unavailable toleration.

e39b510

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

k82cn force-pushed the k8s_61312_2 branch from 27204aa to e39b510 Compare September 7, 2018 08:54

janetkuo approved these changes Sep 10, 2018

View reviewed changes

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 added the sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. label Sep 10, 2018

k8s-github-robot merged commit 323e137 into kubernetes:master Sep 10, 2018

k82cn deleted the k8s_61312_2 branch September 10, 2018 02:47

k82cn mentioned this pull request Sep 11, 2018

Added default tolerations for new pods. #68494

Merged

marpaia mentioned this pull request Sep 20, 2018

Include SIG headers in the duplicate notes section marpaia/release-notes#6

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added unschedulable and network-unavailable toleration. #64954

Added unschedulable and network-unavailable toleration. #64954

k82cn commented Jun 11, 2018 •

edited

Loading

k82cn commented Jun 11, 2018

k82cn commented Jun 11, 2018

k82cn commented Jun 12, 2018

k82cn commented Jun 24, 2018

bsalamat left a comment

k82cn commented Jun 28, 2018

k82cn commented Jul 23, 2018

k82cn commented Jul 23, 2018

k82cn commented Jul 24, 2018

janetkuo Sep 7, 2018

k82cn Sep 7, 2018

janetkuo Sep 7, 2018

k82cn Sep 7, 2018

janetkuo Sep 7, 2018

k82cn Sep 7, 2018

janetkuo Sep 7, 2018

k82cn Sep 7, 2018

k82cn Sep 7, 2018

Huang-Wei commented Sep 7, 2018

Huang-Wei commented Sep 7, 2018

janetkuo commented Sep 10, 2018

k8s-ci-robot commented Sep 10, 2018

k8s-github-robot commented Sep 10, 2018

k82cn commented Sep 10, 2018

k8s-github-robot commented Sep 10, 2018

tpepper commented Sep 10, 2018

k82cn commented Sep 10, 2018

k82cn commented Sep 12, 2018

Added unschedulable and network-unavailable toleration. #64954

Added unschedulable and network-unavailable toleration. #64954

Conversation

k82cn commented Jun 11, 2018 • edited Loading

k82cn commented Jun 11, 2018

k82cn commented Jun 11, 2018

k82cn commented Jun 12, 2018

k82cn commented Jun 24, 2018

bsalamat left a comment

Choose a reason for hiding this comment

k82cn commented Jun 28, 2018

k82cn commented Jul 23, 2018

k82cn commented Jul 23, 2018

k82cn commented Jul 24, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Huang-Wei commented Sep 7, 2018

Huang-Wei commented Sep 7, 2018

janetkuo commented Sep 10, 2018

k8s-ci-robot commented Sep 10, 2018

k8s-github-robot commented Sep 10, 2018

k82cn commented Sep 10, 2018

k8s-github-robot commented Sep 10, 2018

tpepper commented Sep 10, 2018

k82cn commented Sep 10, 2018

k82cn commented Sep 12, 2018

k82cn commented Jun 11, 2018 •

edited

Loading