diff options
| author | Kubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com> | 2017-11-21 04:38:39 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 04:38:39 -0800 |
| commit | 0b054beeee8625117995ab03e0c6247a2bbfe5d5 (patch) | |
| tree | 988d7e14ef600a2c75429af7a42618b04c1e12c3 | |
| parent | 1d86f607ec4881aae6a01c345c0a565c70632abb (diff) | |
| parent | c2cc0d50f0ff41d5c4fe01268e10f9be2ad00627 (diff) | |
Merge pull request #985 from resouer/fix-taint-key
Automatic merge from submit-queue.
Use new taint key in design doc
Part of: https://github.com/kubernetes/kubernetes/issues/51246
~~**DO NOT MERGE** until kubernetes/kubernetes#51266 is in!~~
| -rw-r--r-- | contributors/design-proposals/scheduling/taint-node-by-condition.md | 12 | ||||
| -rw-r--r-- | contributors/design-proposals/storage/local-storage-overview.md | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/contributors/design-proposals/scheduling/taint-node-by-condition.md b/contributors/design-proposals/scheduling/taint-node-by-condition.md index 35a5ee2d..550e9cd9 100644 --- a/contributors/design-proposals/scheduling/taint-node-by-condition.md +++ b/contributors/design-proposals/scheduling/taint-node-by-condition.md @@ -18,20 +18,20 @@ In addition to this, with taint-based-eviction, the Node Controller already tain | ConditionType | Condition Status |Effect | Key | | ------------------ | ------------------ | ------------ | -------- | |Ready |True | - | | -| |False | NoExecute | node.kubernetes.io/notReady | +| |False | NoExecute | node.kubernetes.io/not-ready | | |Unknown | NoExecute | node.kubernetes.io/unreachable | -|OutOfDisk |True | NoSchedule | node.kubernetes.io/outOfDisk | +|OutOfDisk |True | NoSchedule | node.kubernetes.io/out-of-disk | | |False | - | | | |Unknown | - | | -|MemoryPressure |True | NoSchedule | node.kubernetes.io/memoryPressure | +|MemoryPressure |True | NoSchedule | node.kubernetes.io/memory-pressure | | |False | - | | | |Unknown | - | | -|DiskPressure |True | NoSchedule | node.kubernetes.io/diskPressure | +|DiskPressure |True | NoSchedule | node.kubernetes.io/disk-pressure | | |False | - | | | |Unknown | - | | -|NetworkUnavailable |True | NoSchedule | node.kubernetes.io/networkUnavailable | +|NetworkUnavailable |True | NoSchedule | node.kubernetes.io/network-unavailable | | |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/networkUnavailable=: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. +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. diff --git a/contributors/design-proposals/storage/local-storage-overview.md b/contributors/design-proposals/storage/local-storage-overview.md index 8b69d4cb..ab7d3227 100644 --- a/contributors/design-proposals/storage/local-storage-overview.md +++ b/contributors/design-proposals/storage/local-storage-overview.md @@ -332,7 +332,7 @@ The term `Partitions` are used here to describe the main use cases for local sto spec: <snip> nodeTolerations: - - key: node.alpha.kubernetes.io/notReady + - key: node.alpha.kubernetes.io/not-ready operator: TolerationOpExists tolerationSeconds: 600 - key: node.alpha.kubernetes.io/unreachable |