Skip to content

Commit

Permalink
Merge pull request #2 from kubernetes/master
Browse files Browse the repository at this point in the history
sync
  • Loading branch information
ms4720 committed Nov 1, 2017
2 parents 5fd3431 + 691b2d6 commit f17dbe0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions contributors/design-proposals/architecture/namespaces.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ and reference particular entities across operations.
A *Namespace* provides an authorization scope for accessing content associated
with the *Namespace*.

See [Authorization plugins](../admin/authorization.md)
See [Authorization plugins](https://kubernetes.io/docs/admin/authorization/)

### Limit Resource Consumption

Expand All @@ -92,13 +92,13 @@ A *Namespace* provides a scope to limit resource consumption.
A *LimitRange* defines min/max constraints on the amount of resources a single
entity can consume in a *Namespace*.

See [Admission control: Limit Range](admission_control_limit_range.md)
See [Admission control: Limit Range](../resource-management/admission_control_limit_range.md)

A *ResourceQuota* tracks aggregate usage of resources in the *Namespace* and
allows cluster operators to define *Hard* resource usage limits that a
*Namespace* may consume.

See [Admission control: Resource Quota](admission_control_resource_quota.md)
See [Admission control: Resource Quota](../resource-management/admission_control_resource_quota.md)

### Finalizers

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ type CertificateSigningRequestList struct {

## Certificate Request Process

### Node intialization
### Node initialization

When the kubelet executes it checks a location on disk for TLS assets
(currently `/var/run/kubernetes/kubelet.{key,crt}` by default). If it finds
Expand Down

0 comments on commit f17dbe0

Please sign in to comment.