From 50050dfb1b61530a7e3f746ce62db5c04ced9264 Mon Sep 17 00:00:00 2001 From: Karen Bradshaw Date: Mon, 8 Apr 2019 21:23:03 -0400 Subject: [PATCH] clean-up, clarify glossary: taints and tolerations (#13684) --- content/en/docs/reference/glossary/taint.md | 6 +++--- content/en/docs/reference/glossary/toleration.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/content/en/docs/reference/glossary/taint.md b/content/en/docs/reference/glossary/taint.md index 88a6890c61..9faaee579b 100644 --- a/content/en/docs/reference/glossary/taint.md +++ b/content/en/docs/reference/glossary/taint.md @@ -4,15 +4,15 @@ id: taint date: 2019-01-11 full_link: /docs/concepts/configuration/taint-and-toleration/ short_description: > - A key-value pair and an effect to prevent the scheduling of pods on nodes or node groups. + A core object consisting of three required properties: key, value, and effect. Taints prevent the scheduling of pods on nodes or node groups. aka: tags: - core-object - fundamental --- - A key-value pair and an effect to prevent the scheduling of pods on nodes or node groups. + A core object consisting of three required properties: key, value, and effect. Taints prevent the scheduling of pods on nodes or node groups. -Taints and {{< glossary_tooltip text="Tolerations" term_id="toleration" >}} work together to ensure that pods are not scheduled onto inappropriate nodes. One or more taints are applied to a {{< glossary_tooltip text="node" term_id="node" >}}; this marks that the {{< glossary_tooltip text="node" term_id="node" >}} should not accept any pods that do not tolerate the taints. +Taints and {{< glossary_tooltip text="tolerations" term_id="toleration" >}} work together to ensure that pods are not scheduled onto inappropriate nodes. One or more taints are applied to a {{< glossary_tooltip text="node" term_id="node" >}}. A node should only schedule a pod with the matching tolerations for the configured taints. diff --git a/content/en/docs/reference/glossary/toleration.md b/content/en/docs/reference/glossary/toleration.md index 6a2f763d18..e6264224e9 100644 --- a/content/en/docs/reference/glossary/toleration.md +++ b/content/en/docs/reference/glossary/toleration.md @@ -4,15 +4,15 @@ id: toleration date: 2019-01-11 full_link: /docs/concepts/configuration/taint-and-toleration/ short_description: > - A key-value pair and an effect to enable the scheduling of pods on nodes or node groups that have a matching {% glossary_tooltip term_id="taint" %}. + A core object consisting of three required properties: key, value, and effect. Tolerations enable the scheduling of pods on nodes or node groups that have a matching taint. aka: tags: - core-object - fundamental --- - A key-value pair and an effect to enable the scheduling of pods on nodes or node groups that have a matching {{< glossary_tooltip text="taints" term_id="taint" >}}. + A core object consisting of three required properties: key, value, and effect. Tolerations enable the scheduling of pods on nodes or node groups that have matching {{< glossary_tooltip text="taints" term_id="taint" >}}. -Tolerations and {{< glossary_tooltip text="Taints" term_id="taint" >}} work together to ensure that pods are not scheduled onto inappropriate nodes. One or more tolerations are applied to a {{< glossary_tooltip text="pod" term_id="pod" >}}; this marks that the {{< glossary_tooltip text="pod" term_id="pod" >}} is allowed (but not required) to be scheduled on nodes or node groups with matching {{< glossary_tooltip text="taints" term_id="taint" >}}. +Tolerations and {{< glossary_tooltip text="taints" term_id="taint" >}} work together to ensure that pods are not scheduled onto inappropriate nodes. One or more tolerations are applied to a {{< glossary_tooltip text="pod" term_id="pod" >}}. A toleration indicates that the {{< glossary_tooltip text="pod" term_id="pod" >}} is allowed (but not required) to be scheduled on nodes or node groups with matching {{< glossary_tooltip text="taints" term_id="taint" >}}.