Skip to content

Commit 493dae7

Browse files
authored
Merge branch 'master' into hyq-0427
2 parents af18791 + 43fcebd commit 493dae7

File tree

125 files changed

+5711
-4030
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+5711
-4030
lines changed

content/en/docs/concepts/configuration/pod-priority-preemption.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -353,21 +353,22 @@ the removal of the lowest priority Pods is not sufficient to allow the scheduler
353353
to schedule the preemptor Pod, or if the lowest priority Pods are protected by
354354
`PodDisruptionBudget`.
355355

356-
The only component that considers both QoS and Pod priority is
357-
[kubelet out-of-resource eviction](/docs/tasks/administer-cluster/out-of-resource/).
358-
The kubelet ranks Pods for eviction first by whether or not their usage of the
359-
starved resource exceeds requests, then by Priority, and then by the consumption
360-
of the starved compute resource relative to the Pods' scheduling requests.
361-
See
362-
[evicting end-user pods](/docs/tasks/administer-cluster/out-of-resource/#evicting-end-user-pods)
356+
The kubelet uses Priority to determine pod order for [out-of-resource eviction](/docs/tasks/administer-cluster/out-of-resource/).
357+
You can use the QoS class to estimate the order in which pods are most likely
358+
to get evicted. The kubelet ranks pods for eviction based on the following factors:
359+
360+
1. Whether the starved resource usage exceeds requests
361+
1. Pod Priority
362+
1. Amount of resource usage relative to requests
363+
364+
See [evicting end-user pods](/docs/tasks/administer-cluster/out-of-resource/#evicting-end-user-pods)
363365
for more details.
364366

365367
kubelet out-of-resource eviction does not evict Pods when their
366368
usage does not exceed their requests. If a Pod with lower priority is not
367369
exceeding its requests, it won't be evicted. Another Pod with higher priority
368370
that exceeds its requests may be evicted.
369371

370-
371372
## {{% heading "whatsnext" %}}
372373

373374
* Read about using ResourceQuotas in connection with PriorityClasses: [limit Priority Class consumption by default](/docs/concepts/policy/resource-quotas/#limit-priority-class-consumption-by-default)

content/en/docs/reference/access-authn-authz/authentication.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,10 @@ spec:
205205
```
206206
207207
Service account bearer tokens are perfectly valid to use outside the cluster and
208-
209208
can be used to create identities for long standing jobs that wish to talk to the
210-
Kubernetes API. To manually create a service account, simply use the `kubectl`
211-
212-
create serviceaccount (NAME)` command. This creates a service account in the
213-
current namespace and an associated secret.
209+
Kubernetes API. To manually create a service account, use the `kubectl create
210+
serviceaccount (NAME)` command. This creates a service account in the current
211+
namespace and an associated secret.
214212

215213
```bash
216214
kubectl create serviceaccount jenkins

0 commit comments

Comments
 (0)