diff --git a/docs/devel/README.md b/docs/devel/README.md index ed586cd06a8..8a01a8d65c7 100644 --- a/docs/devel/README.md +++ b/docs/devel/README.md @@ -73,6 +73,8 @@ Guide](../admin/README.md). * **Coding Conventions** ([coding-conventions.md](coding-conventions.md)): Coding style advice for contributors. +* **Running a cluster locally** ([running-locally.md](running-locally.md)): + A fast and lightweight local cluster deployment for developement. ## Developing against the Kubernetes API diff --git a/docs/getting-started-guides/locally.md b/docs/devel/running-locally.md similarity index 93% rename from docs/getting-started-guides/locally.md rename to docs/devel/running-locally.md index aaad1c21f24..257b2522a7a 100644 --- a/docs/getting-started-guides/locally.md +++ b/docs/devel/running-locally.md @@ -18,11 +18,6 @@ If you are using a released version of Kubernetes, you should refer to the docs that go with that version. - - -The latest release of this document can be found -[here](http://releases.k8s.io/release-1.1/docs/getting-started-guides/locally.md). - Documentation for other releases can be found at [releases.k8s.io](http://releases.k8s.io). @@ -56,7 +51,7 @@ Getting started locally #### Linux -Not running Linux? Consider running Linux in a local virtual machine with [Vagrant](vagrant.md), or on a cloud provider like [Google Compute Engine](gce.md) +Not running Linux? Consider running Linux in a local virtual machine with [Vagrant](../getting-started-guides/vagrant.md), or on a cloud provider like [Google Compute Engine](../getting-started-guides/gce.md). #### Docker @@ -71,7 +66,7 @@ You need an [etcd](https://github.com/coreos/etcd/releases) in your path, please #### go -You need [go](https://golang.org/doc/install) in your path (see [here](../devel/development.md#go-versions) for supported versions), please make sure it is installed and in your ``$PATH``. +You need [go](https://golang.org/doc/install) in your path (see [here](development.md#go-versions) for supported versions), please make sure it is installed and in your ``$PATH``. ### Clone the repository @@ -174,6 +169,8 @@ One or more of the Kubernetes daemons might've crashed. Tail the logs of each in The local-up-cluster.sh script doesn't start a DNS service. Similar situation can be found [here](http://issue.k8s.io/6667). You can start a manually. Related documents can be found [here](../../cluster/addons/dns/#how-do-i-configure-it) + + -[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/getting-started-guides/locally.md?pixel)]() +[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/devel/running-locally.md?pixel)]() diff --git a/docs/getting-started-guides/README.md b/docs/getting-started-guides/README.md index ad361572563..383fc78bf76 100644 --- a/docs/getting-started-guides/README.md +++ b/docs/getting-started-guides/README.md @@ -83,7 +83,7 @@ The local-machine solutions are: - [Local Docker-based](docker.md) (recommended starting point) - [Vagrant](vagrant.md) (works on any platform with Vagrant: Linux, MacOS, or Windows.) -- [No-VM local cluster](locally.md) (Linux only) +- [No-VM local cluster](../devel/running-locally.md) (Linux only) ### Hosted Solutions @@ -190,7 +190,6 @@ Joyent | Juju | Ubuntu | flannel | [docs](juju.md) AWS | Saltstack | Ubuntu | OVS | [docs](aws.md) | | Community ([@justinsb](https://github.com/justinsb)) Bare-metal | custom | Ubuntu | Calico | [docs](ubuntu-calico.md) | | Community ([@djosborne](https://github.com/djosborne)) Bare-metal | custom | Ubuntu | flannel | [docs](ubuntu.md) | | Community ([@resouer](https://github.com/resouer), [@dalanlan](https://github.com/dalanlan), [@WIZARD-CXY](https://github.com/WIZARD-CXY)) -Local | | | _none_ | [docs](locally.md) | | Community ([@preillyme](https://github.com/preillyme)) libvirt/KVM | CoreOS | CoreOS | libvirt/KVM | [docs](libvirt-coreos.md) | | Community ([@lhuard1A](https://github.com/lhuard1A)) oVirt | | | | [docs](ovirt.md) | | Community ([@simon3z](https://github.com/simon3z)) Rackspace | CoreOS | CoreOS | flannel | [docs](rackspace.md) | | Community ([@doublerr](https://github.com/doublerr))