diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile index a7c64fbcc4c..47304fc03a9 100644 --- a/cluster/images/hyperkube/Makefile +++ b/cluster/images/hyperkube/Makefile @@ -1,6 +1,6 @@ # build the hyperkube image. -VERSION=v0.18.2 +VERSION=v1.0.1 all: cp ../../saltbase/salt/helpers/safe_format_and_mount . diff --git a/docs/getting-started-guides/docker-multinode.md b/docs/getting-started-guides/docker-multinode.md index af7aba677ce..3cd368a0ead 100644 --- a/docs/getting-started-guides/docker-multinode.md +++ b/docs/getting-started-guides/docker-multinode.md @@ -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= +export K8S_VERSION= 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= MASTER_IP= +export K8S_VERSION= +export MASTER_IP= cd kubernetes/cluster/docker-multinode ./worker.sh ``` diff --git a/docs/getting-started-guides/docker.md b/docs/getting-started-guides/docker.md index 48660c7ab64..07aac0a461a 100644 --- a/docs/getting-started-guides/docker.md +++ b/docs/getting-started-guides/docker.md @@ -59,13 +59,13 @@ Here's a diagram of what the final result will look like: ### 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. @@ -75,15 +75,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: @@ -110,7 +110,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. @@ -125,7 +125,7 @@ This should print: ```console NAME LABELS SELECTOR IP PORT(S) -nginx run=nginx 80/TCP +nginx run=nginx run=nginx 80/TCP ``` If ip-addr is blank run the following command to obtain it. Know issue #10836