Skip to content

Commit

Permalink
Patch PR #4140
Browse files Browse the repository at this point in the history
  • Loading branch information
chenopis committed Jun 28, 2017
1 parent 7d9cedd commit 6481f06
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docs/tasks/administer-cluster/safely-drain-node.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ You can attempt an eviction using `curl`:
$ curl -v -H 'Content-type: application/json' http://127.0.0.1:8080/api/v1/namespaces/default/pods/quux/eviction -d @eviction.json
```

The API can respond in one of three ways.
The API can respond in one of three ways:

- If the eviction is granted, then the pod is deleted just as if you had sent
a `DELETE` request to the pod's URL and you get back `200 OK`.
Expand Down
13 changes: 6 additions & 7 deletions docs/tasks/run-application/configure-pdb.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ nodes.
high availability.
* You should know how to deploy [Replicated Stateless Applications](/docs/tasks/run-application/run-stateless-application-deployment.md)
and/or [Replicated Stateful Applications](/docs/tasks/run-application/run-replicated-stateful-application.md).
* You should have read about the [Pod Disruption Budget concept](/docs/tasks/run-application/configure-pdb.md).
* You should have read how to [Configure a Pod Disruption Budget](/docs/tasks/administer-cluster/configure-pod-disruption-budget/).
* You should confirm with your cluster owner or service provider that they respect
Pod Disruption Budgets.
{% endcapture %}
Expand Down Expand Up @@ -109,7 +109,7 @@ of the desired replicas are unhealthy.
In typical usage, a single budget would be used for a collection of pods managed by
a controller—for example, the pods in a single ReplicaSet or StatefulSet.

Note that a disruption budget does not truly guarantee that the specified
**Note:** A disruption budget does not truly guarantee that the specified
number/percentage of pods will always be up. For example, a node that hosts a
pod from the collection may fail when the collection is at the minimum size
specified in the budget, thus bringing the number of available pods from the
Expand All @@ -123,7 +123,7 @@ semantics of `PodDisruptionBudget`.
You can find examples of pod disruption budgets defined below. They match pods with the label
`app: zookeeper`.

Example PDB Using maxUnavailable:
Example PDB Using minAvailable:

```yaml
apiVersion: policy/v1beta1
Expand Down Expand Up @@ -182,9 +182,8 @@ NAME MIN-AVAILABLE ALLOWED-DISRUPTIONS AGE
zk-pdb 2 1 7s
```

The non-zero value for `ALLOWED-DISRUPTIONS` means that the disruption controller
has seen the PDB and counted the matching PDB, and updated the status
of the PDB.
The non-zero value for `ALLOWED-DISRUPTIONS` means that the disruption controller has seen the pods,
counted the matching pods, and update the status of the PDB.

You can get more information about the status of a PDB with this command:

Expand Down Expand Up @@ -216,7 +215,7 @@ You can use a PDB with pods controlled by another type of controller, by an
- only `.spec.minAvailable` can be used, not `.spec.maxUnavailable`.
- only an integer value can be used with `.spec.minAvailable`, not a percentage.

You can use a selector which selects a subset or superset of the pods beloning to a built-in
You can use a selector which selects a subset or superset of the pods belonging to a built-in
controller. However, when there are multiple PDBs in a namespace, you must be careful not
to create PDBs whose selectors overlap.

Expand Down

0 comments on commit 6481f06

Please sign in to comment.