From 72508c26fed3d65a5585fb1cdcf53db0d7b1444c Mon Sep 17 00:00:00 2001 From: Andrew Chen Date: Tue, 1 Aug 2017 02:16:30 -0700 Subject: [PATCH] Reimplement PR #4339 --- docs/concepts/workloads/pods/disruptions.md | 4 +--- docs/tasks/administer-cluster/safely-drain-node.md | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/concepts/workloads/pods/disruptions.md b/docs/concepts/workloads/pods/disruptions.md index 4797ca0c35..400bea7595 100644 --- a/docs/concepts/workloads/pods/disruptions.md +++ b/docs/concepts/workloads/pods/disruptions.md @@ -183,9 +183,7 @@ At some point, the pods terminate, and the cluster look like this: At this point, if an impatient cluster administrator tries to drain `node-2` or `node-3`, the drain command will block, because there are only 2 available -pods for the deployment, and its PDB requires at least 2. After some time - -asses, `pod-d` becomes available. +pods for the deployment, and its PDB requires at least 2. After some time passes, `pod-d` becomes available. The cluster state now looks like this: diff --git a/docs/tasks/administer-cluster/safely-drain-node.md b/docs/tasks/administer-cluster/safely-drain-node.md index f80b39e9c6..c673104429 100644 --- a/docs/tasks/administer-cluster/safely-drain-node.md +++ b/docs/tasks/administer-cluster/safely-drain-node.md @@ -83,7 +83,7 @@ For example, if you have a StatefulSet with three replicas and have set a `PodDisruptionBudget` for that set specifying `minAvailable: 2`. `kubectl drain` will only evict a pod from the StatefulSet if all three pods are ready, and if you issue multiple drain commands in -parallel, Kubernetes will respect the PodDisruptionBudget an ensure +parallel, Kubernetes will respect the PodDisruptionBudget and ensure that only one pod is unavailable at any given time. Any drains that would cause the number of ready replicas to fall below the specified budget are blocked. @@ -91,7 +91,7 @@ budget are blocked. ## The Eviction API If you prefer not to use [kubectl drain](/docs/user-guide/kubectl/{{page.version}}/#drain) (such as -to avoid calling to an external command, or to get finer control over over the pod +to avoid calling to an external command, or to get finer control over the pod eviction process), you can also programmatically cause evictions using the eviction API. You should first be familiar with using [Kubernetes language clients](/docs/tasks/administer-cluster/access-cluster-api/#programmatic-access-to-the-api).