summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork8s-ci-robot <k8s-ci-robot@users.noreply.github.com>2018-05-20 19:40:49 -0700
committerGitHub <noreply@github.com>2018-05-20 19:40:49 -0700
commit0f3d11913865c79a99c75f2dfa0fe66fd0c2884d (patch)
tree3c8be1d59050e937f4acd9e725b7639ab1469b9c
parent0a614ded6f114487dd78b5cec4329d19df8711d4 (diff)
parentff9998346035aaacc1d5e6507116eaef7fc66520 (diff)
Merge pull request #2084 from k82cn/k8s_54313_doc
Doc about PID pressure taint.
-rw-r--r--contributors/design-proposals/scheduling/taint-node-by-condition.md7
1 files changed, 5 insertions, 2 deletions
diff --git a/contributors/design-proposals/scheduling/taint-node-by-condition.md b/contributors/design-proposals/scheduling/taint-node-by-condition.md
index 550e9cd9..2e352d4f 100644
--- a/contributors/design-proposals/scheduling/taint-node-by-condition.md
+++ b/contributors/design-proposals/scheduling/taint-node-by-condition.md
@@ -19,8 +19,8 @@ In addition to this, with taint-based-eviction, the Node Controller already tain
| ------------------ | ------------------ | ------------ | -------- |
|Ready |True | - | |
| |False | NoExecute | node.kubernetes.io/not-ready |
-| |Unknown | NoExecute | node.kubernetes.io/unreachable |
-|OutOfDisk |True | NoSchedule | node.kubernetes.io/out-of-disk |
+| |Unknown | NoExecute | node.kubernetes.io/unreachable |
+|OutOfDisk |True | NoSchedule | node.kubernetes.io/out-of-disk |
| |False | - | |
| |Unknown | - | |
|MemoryPressure |True | NoSchedule | node.kubernetes.io/memory-pressure |
@@ -32,6 +32,9 @@ In addition to this, with taint-based-eviction, the Node Controller already tain
|NetworkUnavailable |True | NoSchedule | node.kubernetes.io/network-unavailable |
| |False | - | |
| |Unknown | - | |
+|PIDPressure |True | NoSchedule | node.kubernetes.io/pid-pressure |
+| |False | - | |
+| |Unknown | - | |
For example, if a CNI network is not detected on the node (e.g. a network is unavailable), the Node Controller will taint the node with `node.kubernetes.io/network-unavailable=:NoSchedule`. This will then allow users to add a toleration to their `PodSpec`, ensuring that the pod can be scheduled to this node if necessary. If the kubelet did not update the node’s status after a grace period, the Node Controller will only taint the node with `node.kubernetes.io/unreachable`; it will not taint the node with any unknown condition.