From 5461bdddacc3f26e4d8987d533b2788f4a346d14 Mon Sep 17 00:00:00 2001 From: Dipankar Das Date: Tue, 31 May 2022 17:25:02 +0530 Subject: [PATCH 1/4] modifications to taint-and-tolerations * change to the tolerations overview wrt to pods * syntax of defining taint for a node Signed-off-by: Dipankar Das --- .../concepts/scheduling-eviction/taint-and-toleration.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/content/en/docs/concepts/scheduling-eviction/taint-and-toleration.md b/content/en/docs/concepts/scheduling-eviction/taint-and-toleration.md index 030f28e7d1..17740f331c 100644 --- a/content/en/docs/concepts/scheduling-eviction/taint-and-toleration.md +++ b/content/en/docs/concepts/scheduling-eviction/taint-and-toleration.md @@ -15,7 +15,7 @@ is a property of {{< glossary_tooltip text="Pods" term_id="pod" >}} that *attrac a set of {{< glossary_tooltip text="nodes" term_id="node" >}} (either as a preference or a hard requirement). _Taints_ are the opposite -- they allow a node to repel a set of pods. -_Tolerations_ are applied to pods, and allow (but do not require) the pods to schedule +_Tolerations_ are applied to pods, it does not guarantee that pod will get scheduled onto nodes with matching taints. Taints and tolerations work together to ensure that pods are not scheduled @@ -28,6 +28,11 @@ marks that the node should not accept any pods that do not tolerate the taints. ## Concepts +Basic Syntax +```shell +kubectl taint nodes =: +``` + You add a taint to a node using [kubectl taint](/docs/reference/generated/kubectl/kubectl-commands#taint). For example, From d2f168f4635aa27a3eec73fd00503b970325d27d Mon Sep 17 00:00:00 2001 From: Dipankar Das Date: Thu, 2 Jun 2022 16:33:22 +0530 Subject: [PATCH 2/4] verbose explaination is added Signed-off-by: Dipankar Das --- .../docs/concepts/scheduling-eviction/taint-and-toleration.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/content/en/docs/concepts/scheduling-eviction/taint-and-toleration.md b/content/en/docs/concepts/scheduling-eviction/taint-and-toleration.md index 17740f331c..d98a527e13 100644 --- a/content/en/docs/concepts/scheduling-eviction/taint-and-toleration.md +++ b/content/en/docs/concepts/scheduling-eviction/taint-and-toleration.md @@ -15,8 +15,7 @@ is a property of {{< glossary_tooltip text="Pods" term_id="pod" >}} that *attrac a set of {{< glossary_tooltip text="nodes" term_id="node" >}} (either as a preference or a hard requirement). _Taints_ are the opposite -- they allow a node to repel a set of pods. -_Tolerations_ are applied to pods, it does not guarantee that pod will get scheduled -onto nodes with matching taints. +_Tolerations_ are applied to pods, if it matches the Taints in any node it is scheduled, but it does not guarantee as scheduler has other paramters to decide. Taints and tolerations work together to ensure that pods are not scheduled onto inappropriate nodes. One or more taints are applied to a node; this From e705ab827a8c6e95d3c03d9d198ea090cb2c74b9 Mon Sep 17 00:00:00 2001 From: Dipankar Das Date: Thu, 2 Jun 2022 16:35:13 +0530 Subject: [PATCH 3/4] Removed the redundant syntax addition Signed-off-by: Dipankar Das --- .../concepts/scheduling-eviction/taint-and-toleration.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/content/en/docs/concepts/scheduling-eviction/taint-and-toleration.md b/content/en/docs/concepts/scheduling-eviction/taint-and-toleration.md index d98a527e13..abcacdab08 100644 --- a/content/en/docs/concepts/scheduling-eviction/taint-and-toleration.md +++ b/content/en/docs/concepts/scheduling-eviction/taint-and-toleration.md @@ -27,11 +27,6 @@ marks that the node should not accept any pods that do not tolerate the taints. ## Concepts -Basic Syntax -```shell -kubectl taint nodes =: -``` - You add a taint to a node using [kubectl taint](/docs/reference/generated/kubectl/kubectl-commands#taint). For example, From 42b739ff6557ad30f1515a7f97179dd1b9398d89 Mon Sep 17 00:00:00 2001 From: Dipankar Das <65275144+dipankardas011@users.noreply.github.com> Date: Thu, 16 Jun 2022 09:51:36 +0530 Subject: [PATCH 4/4] improved the taints and toleration Update content/en/docs/concepts/scheduling-eviction/taint-and-toleration.md Co-authored-by: ZSC --- .../docs/concepts/scheduling-eviction/taint-and-toleration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/concepts/scheduling-eviction/taint-and-toleration.md b/content/en/docs/concepts/scheduling-eviction/taint-and-toleration.md index abcacdab08..ff7718a1f3 100644 --- a/content/en/docs/concepts/scheduling-eviction/taint-and-toleration.md +++ b/content/en/docs/concepts/scheduling-eviction/taint-and-toleration.md @@ -15,7 +15,7 @@ is a property of {{< glossary_tooltip text="Pods" term_id="pod" >}} that *attrac a set of {{< glossary_tooltip text="nodes" term_id="node" >}} (either as a preference or a hard requirement). _Taints_ are the opposite -- they allow a node to repel a set of pods. -_Tolerations_ are applied to pods, if it matches the Taints in any node it is scheduled, but it does not guarantee as scheduler has other paramters to decide. +_Tolerations_ are applied to pods. Tolerations allow the scheduler to schedule pods with matching taints. Tolerations allow scheduling but don't guarantee scheduling: the scheduler also [evaluates other parameters](https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/) as part of its function. Taints and tolerations work together to ensure that pods are not scheduled onto inappropriate nodes. One or more taints are applied to a node; this