From 4b904c34a8637f9b10c7b072c431fe3ed150cc99 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Wed, 10 Jun 2015 09:21:34 -0700 Subject: [PATCH] Update Docker instructions. --- cluster/images/hyperkube/Makefile | 2 +- cluster/images/hyperkube/master-multi.json | 8 ++++---- cluster/images/hyperkube/master.json | 8 ++++---- docs/getting-started-guides/docker-multinode/master.md | 8 ++++---- docs/getting-started-guides/docker-multinode/worker.md | 4 ++-- docs/getting-started-guides/docker.md | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile index 7c5ccf40682..4ac70d2fb9d 100644 --- a/cluster/images/hyperkube/Makefile +++ b/cluster/images/hyperkube/Makefile @@ -1,6 +1,6 @@ # build the hyperkube image. -VERSION=v0.17.0 +VERSION=v0.18.2 all: cp ../../saltbase/salt/helpers/safe_format_and_mount . diff --git a/cluster/images/hyperkube/master-multi.json b/cluster/images/hyperkube/master-multi.json index 4b980648387..0eba400bc35 100644 --- a/cluster/images/hyperkube/master-multi.json +++ b/cluster/images/hyperkube/master-multi.json @@ -7,7 +7,7 @@ "containers":[ { "name": "controller-manager", - "image": "gcr.io/google_containers/hyperkube:v0.17.0", + "image": "gcr.io/google_containers/hyperkube:v0.18.2", "command": [ "/hyperkube", "controller-manager", @@ -19,11 +19,11 @@ }, { "name": "apiserver", - "image": "gcr.io/google_containers/hyperkube:v0.17.0", + "image": "gcr.io/google_containers/hyperkube:v0.18.2", "command": [ "/hyperkube", "apiserver", - "--service-cluster-ip-range=10.0.0.1/24", + "--portal-net=10.0.0.1/24", "--address=0.0.0.0", "--etcd_servers=http://127.0.0.1:4001", "--cluster_name=kubernetes", @@ -32,7 +32,7 @@ }, { "name": "scheduler", - "image": "gcr.io/google_containers/hyperkube:v0.17.0", + "image": "gcr.io/google_containers/hyperkube:v0.18.2", "command": [ "/hyperkube", "scheduler", diff --git a/cluster/images/hyperkube/master.json b/cluster/images/hyperkube/master.json index 13975101b6c..85a87aabf07 100644 --- a/cluster/images/hyperkube/master.json +++ b/cluster/images/hyperkube/master.json @@ -7,7 +7,7 @@ "containers":[ { "name": "controller-manager", - "image": "gcr.io/google_containers/hyperkube:v0.17.0", + "image": "gcr.io/google_containers/hyperkube:v0.18.2", "command": [ "/hyperkube", "controller-manager", @@ -19,11 +19,11 @@ }, { "name": "apiserver", - "image": "gcr.io/google_containers/hyperkube:v0.17.0", + "image": "gcr.io/google_containers/hyperkube:v0.18.2", "command": [ "/hyperkube", "apiserver", - "--service-cluster-ip-range=10.0.0.1/24", + "--portal-net=10.0.0.1/24", "--address=127.0.0.1", "--etcd_servers=http://127.0.0.1:4001", "--cluster_name=kubernetes", @@ -32,7 +32,7 @@ }, { "name": "scheduler", - "image": "gcr.io/google_containers/hyperkube:v0.17.0", + "image": "gcr.io/google_containers/hyperkube:v0.18.2", "command": [ "/hyperkube", "scheduler", diff --git a/docs/getting-started-guides/docker-multinode/master.md b/docs/getting-started-guides/docker-multinode/master.md index 93e3e5cf733..33ebfe9b2a3 100644 --- a/docs/getting-started-guides/docker-multinode/master.md +++ b/docs/getting-started-guides/docker-multinode/master.md @@ -108,20 +108,20 @@ systemctl start docker Ok, now that your networking is set up, you can startup Kubernetes, this is the same as the single-node case, we will use the "main" instance of the Docker daemon for the Kubernetes components. ```sh -sudo docker run --net=host -d -v /var/run/docker.sock:/var/run/docker.sock gcr.io/google_containers/hyperkube:v0.17.0 /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-multi +sudo docker run --net=host -d -v /var/run/docker.sock:/var/run/docker.sock gcr.io/google_containers/hyperkube:v0.18.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-multi ``` ### Also run the service proxy ```sh -sudo docker run -d --net=host --privileged gcr.io/google_containers/hyperkube:v0.17.0 /hyperkube proxy --master=http://127.0.0.1:8080 --v=2 +sudo docker run -d --net=host --privileged gcr.io/google_containers/hyperkube:v0.18.2 /hyperkube proxy --master=http://127.0.0.1:8080 --v=2 ``` ### Test it out At this point, you should have a functioning 1-node cluster. Let's test it out! Download the kubectl binary -([OS X](http://storage.googleapis.com/kubernetes-release/release/v0.17.0/bin/darwin/amd64/kubectl)) -([linux](http://storage.googleapis.com/kubernetes-release/release/v0.17.0/bin/linux/amd64/kubectl)) +([OS X](http://storage.googleapis.com/kubernetes-release/release/v0.18.2/bin/darwin/amd64/kubectl)) +([linux](http://storage.googleapis.com/kubernetes-release/release/v0.18.2/bin/linux/amd64/kubectl)) List the nodes diff --git a/docs/getting-started-guides/docker-multinode/worker.md b/docs/getting-started-guides/docker-multinode/worker.md index 7134c680cce..617e398cb24 100644 --- a/docs/getting-started-guides/docker-multinode/worker.md +++ b/docs/getting-started-guides/docker-multinode/worker.md @@ -93,14 +93,14 @@ systemctl start docker Again this is similar to the above, but the ```--api_servers``` now points to the master we set up in the beginning. ```sh -sudo docker run --net=host -d -v /var/run/docker.sock:/var/run/docker.sock gcr.io/google_containers/hyperkube:v0.17.0 /hyperkube kubelet --api_servers=http://${MASTER_IP}:8080 --v=2 --address=0.0.0.0 --enable_server --hostname_override=$(hostname -i) +sudo docker run --net=host -d -v /var/run/docker.sock:/var/run/docker.sock gcr.io/google_containers/hyperkube:v0.18.2 /hyperkube kubelet --api_servers=http://${MASTER_IP}:8080 --v=2 --address=0.0.0.0 --enable_server --hostname_override=$(hostname -i) ``` #### Run the service proxy The service proxy provides load-balancing between groups of containers defined by Kubernetes ```Services``` ```sh -sudo docker run -d --net=host --privileged gcr.io/google_containers/hyperkube:v0.17.0 /hyperkube proxy --master=http://${MASTER_IP}:8080 --v=2 +sudo docker run -d --net=host --privileged gcr.io/google_containers/hyperkube:v0.18.2 /hyperkube proxy --master=http://${MASTER_IP}:8080 --v=2 ``` diff --git a/docs/getting-started-guides/docker.md b/docs/getting-started-guides/docker.md index cf9e83ea045..10a1cb1a749 100644 --- a/docs/getting-started-guides/docker.md +++ b/docs/getting-started-guides/docker.md @@ -12,7 +12,7 @@ docker run --net=host -d gcr.io/google_containers/etcd:2.0.9 /usr/local/bin/etcd ### 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.17.0 /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:v0.18.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 ``` This actually runs the kubelet, which in turn runs a [pod](http://docs.k8s.io/pods.md) that contains the other master components. @@ -20,14 +20,14 @@ This actually runs the kubelet, which in turn runs a [pod](http://docs.k8s.io/po ### Step Three: Run the service proxy *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.17.0 /hyperkube proxy --master=http://127.0.0.1:8080 --v=2 +docker run -d --net=host --privileged gcr.io/google_containers/hyperkube:v0.18.2 /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.17.0/bin/darwin/amd64/kubectl)) -([linux](https://storage.googleapis.com/kubernetes-release/release/v0.17.0/bin/linux/amd64/kubectl)) +([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)) *Note:* On OS/X you will need to set up port forwarding via ssh: