github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:asridharan/kubernetes into fix_docker_doc

Browse Source
This commit is contained in:
Avinash Sridharan
2015-07-30 14:30:08 -07:00
parent 895cbb92ad cdb7d1ec61
commit bf46a08f14
150 changed files with 4439 additions and 1440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/getting-started-guides/README.md
View File

@@ -134,7 +134,7 @@ Here are all the solutions mentioned above in table form.
IaaS Provider | Config. Mgmt | OS | Networking | Docs | Conforms | Support Level
-------------------- | ------------ | ------ | ---------- | --------------------------------------------- | ---------| ----------------------------
GKE | | | GCE | [docs](https://cloud.google.com/container-engine) | | Commercial
Vagrant | Saltstack | Fedora | OVS | [docs](vagrant.md) | | Project
Vagrant | Saltstack | Fedora | OVS | [docs](vagrant.md) | [✓][2] | Project
GCE | Saltstack | Debian | GCE | [docs](gce.md) | [✓][1] | Project
Azure | CoreOS | CoreOS | Weave | [docs](coreos/azure/README.md) | | Community ([@errordeveloper](https://github.com/errordeveloper), [@squillace](https://github.com/squillace), [@chanezon](https://github.com/chanezon), [@crossorigin](https://github.com/crossorigin))
Docker Single Node | custom | N/A | local | [docs](docker.md) | | Project (@brendandburns)
@@ -164,7 +164,7 @@ Local | | | _none_ | [docs](locally.md)
libvirt/KVM | CoreOS | CoreOS | libvirt/KVM | [docs](libvirt-coreos.md) | | Community (@lhuard1A)
oVirt | | | | [docs](ovirt.md) | | Community (@simon3z)
Rackspace | CoreOS | CoreOS | flannel | [docs](rackspace.md) | | Community (@doublerr)
any | any | any | any | [docs](scratch.md) | | Community (@doublerr)
any | any | any | any | [docs](scratch.md) | | Community (@erictune)
*Note*: The above table is ordered by version test/used in notes followed by support level.
@@ -189,6 +189,8 @@ Definition of columns:
<!-- reference style links below here -->
<!-- GCE conformance test result -->
[1]: https://gist.github.com/erictune/4cabc010906afbcc5061
<!-- Vagrant conformance test result -->
[2]: https://gist.github.com/derekwaynecarr/505e56036cdf010bf6b6
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->

7
docs/getting-started-guides/docker-multinode.md
View File

@@ -39,7 +39,7 @@ interested in just starting to explore Kubernetes, we recommend that you start t
_Note_:
There is a [bug](https://github.com/docker/docker/issues/14106) in Docker 1.7.0 that prevents this from working correctly.
Please install Docker 1.6.2 or wait for Docker 1.7.1.
Please install Docker 1.6.2 or Docker 1.7.1.
**Table of Contents**
@@ -83,7 +83,7 @@ The first step in the process is to initialize the master node.
Clone the Kubernetes repo, and run [master.sh](docker-multinode/master.sh) on the master machine with root:
```sh
export K8S_VERSION=<your_k8s_version>
export K8S_VERSION=<your_k8s_version (e.g. 1.0.1)>
cd kubernetes/cluster/docker-multinode
./master.sh
```
@@ -99,7 +99,8 @@ Once your master is up and running you can add one or more workers on different
Clone the Kubernetes repo, and run [worker.sh](docker-multinode/worker.sh) on the worker machine with root:
```sh
export K8S_VERSION=<your_k8s_version> MASTER_IP=<your_master_ip>
export K8S_VERSION=<your_k8s_version (e.g. 1.0.1)>
export MASTER_IP=<your_master_ip (e.g. 1.2.3.4)>
cd kubernetes/cluster/docker-multinode
./worker.sh
```

14
docs/getting-started-guides/docker.md
View File

@@ -78,13 +78,13 @@ output of /proc/cmdline
### Step One: Run etcd
```sh
docker run --net=host -d gcr.io/google_containers/etcd:2.0.9 /usr/local/bin/etcd --addr=127.0.0.1:4001 --bind-addr=0.0.0.0:4001 --data-dir=/var/etcd/data
docker run --net=host -d gcr.io/google_containers/etcd:2.0.12 /usr/local/bin/etcd --addr=127.0.0.1:4001 --bind-addr=0.0.0.0:4001 --data-dir=/var/etcd/data
```
### Step Two: Run the master
```sh
docker run --net=host -d -v /var/run/docker.sock:/var/run/docker.sock gcr.io/google_containers/hyperkube:v0.21.2 /hyperkube kubelet --api_servers=http://localhost:8080 --v=2 --address=0.0.0.0 --enable_server --hostname_override=127.0.0.1 --config=/etc/kubernetes/manifests
docker run --net=host -d -v /var/run/docker.sock:/var/run/docker.sock gcr.io/google_containers/hyperkube:v1.0.1 /hyperkube kubelet --api_servers=http://localhost:8080 --v=2 --address=0.0.0.0 --enable_server --hostname_override=127.0.0.1 --config=/etc/kubernetes/manifests
```
This actually runs the kubelet, which in turn runs a [pod](../user-guide/pods.md) that contains the other master components.
@@ -94,15 +94,15 @@ This actually runs the kubelet, which in turn runs a [pod](../user-guide/pods.md
*Note, this could be combined with master above, but it requires --privileged for iptables manipulation*
```sh
docker run -d --net=host --privileged gcr.io/google_containers/hyperkube:v0.21.2 /hyperkube proxy --master=http://127.0.0.1:8080 --v=2
docker run -d --net=host --privileged gcr.io/google_containers/hyperkube:v1.0.1 /hyperkube proxy --master=http://127.0.0.1:8080 --v=2
```
### Test it out
At this point you should have a running Kubernetes cluster. You can test this by downloading the kubectl
binary
([OS X](https://storage.googleapis.com/kubernetes-release/release/v0.18.2/bin/darwin/amd64/kubectl))
([linux](https://storage.googleapis.com/kubernetes-release/release/v0.18.2/bin/linux/amd64/kubectl))
([OS X](https://storage.googleapis.com/kubernetes-release/release/v1.0.1/bin/darwin/amd64/kubectl))
([linux](https://storage.googleapis.com/kubernetes-release/release/v1.0.1/bin/linux/amd64/kubectl))
*Note:*
On OS/X you will need to set up port forwarding via ssh:
@@ -129,7 +129,7 @@ If you are running different Kubernetes clusters, you may need to specify `-s ht
### Run an application
```sh
kubectl -s http://localhost:8080 run-container nginx --image=nginx --port=80
kubectl -s http://localhost:8080 run nginx --image=nginx --port=80
```
now run `docker ps` you should see nginx running. You may need to wait a few minutes for the image to get pulled.
@@ -144,7 +144,7 @@ This should print:
```console
NAME LABELS SELECTOR IP PORT(S)
nginx <none> run=nginx <ip-addr> 80/TCP
nginx run=nginx run=nginx <ip-addr> 80/TCP
```
If ip-addr is blank run the following command to obtain it. Know issue #10836

8
docs/man/man1/kubectl-stop.1
View File

@@ -3,7 +3,7 @@
.SH NAME
.PP
kubectl stop \- Gracefully shut down a resource by name or filename.
kubectl stop \- Deprecated: Gracefully shut down a resource by name or filename.
.SH SYNOPSIS
@@ -13,7 +13,11 @@ kubectl stop \- Gracefully shut down a resource by name or filename.
.SH DESCRIPTION
.PP
Gracefully shut down a resource by name or filename.
Deprecated: Gracefully shut down a resource by name or filename.
.PP
stop command is deprecated, all its functionalities are covered by delete command.
See 'kubectl delete \-\-help' for more details.
.PP
Attempts to shut down and delete a resource that supports graceful termination.

4
docs/user-guide/kubectl/kubectl.md
View File

@@ -97,10 +97,10 @@ kubectl
* [kubectl rolling-update](kubectl_rolling-update.md) - Perform a rolling update of the given ReplicationController.
* [kubectl run](kubectl_run.md) - Run a particular image on the cluster.
* [kubectl scale](kubectl_scale.md) - Set a new size for a Replication Controller.
* [kubectl stop](kubectl_stop.md) - Gracefully shut down a resource by name or filename.
* [kubectl stop](kubectl_stop.md) - Deprecated: Gracefully shut down a resource by name or filename.
* [kubectl version](kubectl_version.md) - Print the client and server version information.
###### Auto generated by spf13/cobra at 2015-07-14 00:11:42.96000791 +0000 UTC
###### Auto generated by spf13/cobra at 2015-07-29 09:18:59.541696918 +0000 UTC
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->

9
docs/user-guide/kubectl/kubectl_stop.md
View File

@@ -33,12 +33,15 @@ Documentation for other releases can be found at
## kubectl stop
Gracefully shut down a resource by name or filename.
Deprecated: Gracefully shut down a resource by name or filename.
### Synopsis
Gracefully shut down a resource by name or filename.
Deprecated: Gracefully shut down a resource by name or filename.
stop command is deprecated, all its functionalities are covered by delete command.
See 'kubectl delete --help' for more details.
Attempts to shut down and delete a resource that supports graceful termination.
If the resource is scalable it will be scaled to 0 before deletion.
@@ -109,7 +112,7 @@ $ kubectl stop -f path/to/resources
* [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager
###### Auto generated by spf13/cobra at 2015-07-14 00:11:42.957441942 +0000 UTC
###### Auto generated by spf13/cobra at 2015-07-29 09:18:59.539597953 +0000 UTC
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->