github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6970 from marekbiskup/typoFix 

Broken links fixed.
pull/6/head
Wojciech Tyczynski 2015-04-17 12:47:41 +02:00
parent 23f2401b45 817049cc73
commit a20215beec
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/glossary.md
View File

@ -3,8 +3,8 @@
**Authorization**
:Kubernetes does not currently have an authorization system. Anyone with the cluster password can do anything. We plan
to add sophisticated authorization, and to make it pluggable. See the [access control design doc](./devel/access.md) and
[this issue](https://github.com/GoogleCloudPlatform/kubernetes/issue/1430).
to add sophisticated authorization, and to make it pluggable. See the [access control design doc](./design/access.md) and
[this issue](https://github.com/GoogleCloudPlatform/kubernetes/issues/1430).
**Annotation**
: A key/value pair that can hold large (compared to a Label), and possibly not human-readable data. Intended to store

2
docs/images.md
View File

@ -8,7 +8,7 @@ The `image` property of a container supports the same syntax as the `docker` com
## Using a Private Registry
### Google Container Registry
Kubernetes has native support for the [Google Container Regisry](https://cloud.google.com/tools/container-registry/), when running on Google Compute Engine. If you are running your cluster on Google Compute Engine or Google Container Engine, simply use the full image name (e.g. gcr.io/my_project/image:tag) and the kubelet will automatically authenticate and pull down your private image.
Kubernetes has native support for the [Google Container Registry](https://cloud.google.com/tools/container-registry/), when running on Google Compute Engine. If you are running your cluster on Google Compute Engine or Google Container Engine, simply use the full image name (e.g. gcr.io/my_project/image:tag) and the kubelet will automatically authenticate and pull down your private image.
### Other Private Registries
Docker stores keys for private registries in a `.dockercfg` file. Create a config file by running `docker login <registry>.<domain>` and then copying the resulting `.dockercfg` file to the kubelet working dir.

2
docs/networking.md
View File

@ -156,7 +156,7 @@ people have reported success with Flannel and Kubernetes.
### OpenVSwitch
[OpenVSwitch](../ovs-networking.md) is a somewhat more mature but also
[OpenVSwitch](./ovs-networking.md) is a somewhat more mature but also
complicated way to build an overlay network. This is endorsed by several of the
"Big Shops" for networking.