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

Merge pull request #8168 from brendandburns/docker

Browse Source 
Update single node docker to 0.16.2
This commit is contained in:
Rohit Jnagal 2015-05-13 13:25:27 -07:00
commit a1ef8585da
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/images/hyperkube/Makefile
View File

@ -1,6 +1,6 @@
# build the hyperkube image.
VERSION=v0.14.2
VERSION=v0.16.2
all:
curl -O https://storage.googleapis.com/kubernetes-release/release/${VERSION}/bin/linux/amd64/hyperkube

6
cluster/images/hyperkube/master.json
View File

@ -7,7 +7,7 @@
"containers":[
{
"name": "controller-manager",
"image": "gcr.io/google_containers/hyperkube:v0.14.1",
"image": "gcr.io/google_containers/hyperkube:v0.16.2",
"command": [
"/hyperkube",
"controller-manager",
@ -19,7 +19,7 @@
},
{
"name": "apiserver",
"image": "gcr.io/google_containers/hyperkube:v0.14.1",
"image": "gcr.io/google_containers/hyperkube:v0.16.2",
"command": [
"/hyperkube",
"apiserver",
@ -32,7 +32,7 @@
},
{
"name": "scheduler",
"image": "gcr.io/google_containers/hyperkube:v0.14.1",
"image": "gcr.io/google_containers/hyperkube:v0.16.2",
"command": [
"/hyperkube",
"scheduler",

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

@ -7,12 +7,12 @@ Here's a diagram of what the final result will look like:
### Step One: Run etcd
```sh
docker run --net=host -d kubernetes/etcd:2.0.5.1 /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.9 /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.14.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:v0.16.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.14.2 /hyperkube proxy --master=http://127.0.0.1:8080 --v=2
docker run -d --net=host --privileged gcr.io/google_containers/hyperkube:v0.16.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.14.2/bin/darwin/amd64/kubectl))
([linux](https://storage.googleapis.com/kubernetes-release/release/v0.14.2/bin/linux/amd64/kubectl))
([OS X](https://storage.googleapis.com/kubernetes-release/release/v0.16.2/bin/darwin/amd64/kubectl))
([linux](https://storage.googleapis.com/kubernetes-release/release/v0.16.2/bin/linux/amd64/kubectl))
*Note:*
On OS/X you will need to set up port forwarding via ssh: