From 13a486fa631e60c9c5f0d57ad33e631a49fe3953 Mon Sep 17 00:00:00 2001 From: Harry Zhang Date: Thu, 24 Aug 2017 21:26:07 +0800 Subject: [PATCH] Use right taint key in doc --- docs/concepts/configuration/assign-pod-node.md | 8 ++++---- docs/concepts/workloads/controllers/daemonset.md | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/concepts/configuration/assign-pod-node.md b/docs/concepts/configuration/assign-pod-node.md index 12331bacfe39f..586211703936e 100644 --- a/docs/concepts/configuration/assign-pod-node.md +++ b/docs/concepts/configuration/assign-pod-node.md @@ -505,12 +505,12 @@ tolerations: tolerationSeconds: 6000 ``` -(For the node not ready case, change the key to `node.alpha.kubernetes.io/notReady`.) +(For the node not ready case, change the key to `node.alpha.kubernetes.io/not-ready`.) Note that Kubernetes automatically adds a toleration for -`node.alpha.kubernetes.io/notReady` with `tolerationSeconds=300` +`node.alpha.kubernetes.io/not-ready` with `tolerationSeconds=300` unless the pod configuration provided -by the user already has a toleration for `node.alpha.kubernetes.io/notReady`. +by the user already has a toleration for `node.alpha.kubernetes.io/not-ready`. Likewise it adds a toleration for `node.alpha.kubernetes.io/unreachable` with `tolerationSeconds=300` unless the pod configuration provided @@ -523,6 +523,6 @@ The two default tolerations are added by the [DefaultTolerationSeconds admission controller](https://git.k8s.io/kubernetes/plugin/pkg/admission/defaulttolerationseconds). [DaemonSet](/docs/concepts/workloads/controllers/daemonset/) pods are created with -`NoExecute` tolerations for `node.alpha.kubernetes.io/unreachable` and `node.alpha.kubernetes.io/notReady` +`NoExecute` tolerations for `node.alpha.kubernetes.io/unreachable` and `node.alpha.kubernetes.io/not-ready` with no `tolerationSeconds`. This ensures that DaemonSet pods are never evicted due to these problems, which matches the behavior when this feature is disabled. diff --git a/docs/concepts/workloads/controllers/daemonset.md b/docs/concepts/workloads/controllers/daemonset.md index 54e85d28aa63c..24a85965e1936 100644 --- a/docs/concepts/workloads/controllers/daemonset.md +++ b/docs/concepts/workloads/controllers/daemonset.md @@ -101,14 +101,14 @@ when the pod is created, so it is ignored by the scheduler). Therefore: Daemon pods do respect [taints and tolerations](/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature), but they are created with `NoExecute` tolerations for the following taints with no `tolerationSeconds`: - - `node.alpha.kubernetes.io/notReady` + - `node.alpha.kubernetes.io/not-ready` - `node.alpha.kubernetes.io/unreachable` - - `node.alpha.kubernetes.io/memoryPressure` - - `node.alpha.kubernetes.io/diskPressure` + - `node.alpha.kubernetes.io/memory-pressure` + - `node.alpha.kubernetes.io/disk-pressure` When the support to critical pods is enabled and the pods in a DaemonSet are labelled as critical, the Daemon pods are created with an additional -`NoExecute` toleration for the `node.alpha.kubernetes.io/outOfDisk` taint with +`NoExecute` toleration for the `node.alpha.kubernetes.io/out-of-disk` taint with no `tolerationSeconds`. This ensures that when the `TaintBasedEvictions` alpha feature is enabled,