diff options
| author | Marc Spitzer <mspitzer@gmail.com> | 2017-11-01 03:58:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-01 03:58:25 -0500 |
| commit | f17dbe0e6335513789697b3535cd19020dc39b31 (patch) | |
| tree | 8805ea8f915a027a79418ec354323f6fe1dee465 | |
| parent | 5fd3431b630aaedf0b3dd339afb8c6d155bad771 (diff) | |
| parent | 691b2d6a3c23f1a7aaca986f431fd2ff335d4447 (diff) | |
Merge pull request #2 from kubernetes/master
sync
| -rw-r--r-- | contributors/design-proposals/architecture/namespaces.md | 6 | ||||
| -rw-r--r-- | contributors/design-proposals/cluster-lifecycle/kubelet-tls-bootstrap.md | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contributors/design-proposals/architecture/namespaces.md b/contributors/design-proposals/architecture/namespaces.md index 703c1cb3..b0cd2129 100644 --- a/contributors/design-proposals/architecture/namespaces.md +++ b/contributors/design-proposals/architecture/namespaces.md @@ -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 @@ -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 diff --git a/contributors/design-proposals/cluster-lifecycle/kubelet-tls-bootstrap.md b/contributors/design-proposals/cluster-lifecycle/kubelet-tls-bootstrap.md index fbd98413..75d90b4c 100644 --- a/contributors/design-proposals/cluster-lifecycle/kubelet-tls-bootstrap.md +++ b/contributors/design-proposals/cluster-lifecycle/kubelet-tls-bootstrap.md @@ -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 |