Skip to content

Commit 4b904c3

Browse files
brendandburnsbrendandburns
committed
Update Docker instructions.
1 parent c8591bd commit 4b904c3

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

‎cluster/images/hyperkube/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# build the hyperkube image.
22

3-
VERSION=v0.17.0
3+
VERSION=v0.18.2
44

55
all:
66
cp ../../saltbase/salt/helpers/safe_format_and_mount .

‎cluster/images/hyperkube/master-multi.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"containers":[
88
{
99
"name": "controller-manager",
10-
"image": "gcr.io/google_containers/hyperkube:v0.17.0",
10+
"image": "gcr.io/google_containers/hyperkube:v0.18.2",
1111
"command": [
1212
"/hyperkube",
1313
"controller-manager",
@@ -19,11 +19,11 @@
1919
},
2020
{
2121
"name": "apiserver",
22-
"image": "gcr.io/google_containers/hyperkube:v0.17.0",
22+
"image": "gcr.io/google_containers/hyperkube:v0.18.2",
2323
"command": [
2424
"/hyperkube",
2525
"apiserver",
26-
"--service-cluster-ip-range=10.0.0.1/24",
26+
"--portal-net=10.0.0.1/24",
2727
"--address=0.0.0.0",
2828
"--etcd_servers=http://127.0.0.1:4001",
2929
"--cluster_name=kubernetes",
@@ -32,7 +32,7 @@
3232
},
3333
{
3434
"name": "scheduler",
35-
"image": "gcr.io/google_containers/hyperkube:v0.17.0",
35+
"image": "gcr.io/google_containers/hyperkube:v0.18.2",
3636
"command": [
3737
"/hyperkube",
3838
"scheduler",

‎cluster/images/hyperkube/master.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"containers":[
88
{
99
"name": "controller-manager",
10-
"image": "gcr.io/google_containers/hyperkube:v0.17.0",
10+
"image": "gcr.io/google_containers/hyperkube:v0.18.2",
1111
"command": [
1212
"/hyperkube",
1313
"controller-manager",
@@ -19,11 +19,11 @@
1919
},
2020
{
2121
"name": "apiserver",
22-
"image": "gcr.io/google_containers/hyperkube:v0.17.0",
22+
"image": "gcr.io/google_containers/hyperkube:v0.18.2",
2323
"command": [
2424
"/hyperkube",
2525
"apiserver",
26-
"--service-cluster-ip-range=10.0.0.1/24",
26+
"--portal-net=10.0.0.1/24",
2727
"--address=127.0.0.1",
2828
"--etcd_servers=http://127.0.0.1:4001",
2929
"--cluster_name=kubernetes",
@@ -32,7 +32,7 @@
3232
},
3333
{
3434
"name": "scheduler",
35-
"image": "gcr.io/google_containers/hyperkube:v0.17.0",
35+
"image": "gcr.io/google_containers/hyperkube:v0.18.2",
3636
"command": [
3737
"/hyperkube",
3838
"scheduler",

‎docs/getting-started-guides/docker-multinode/master.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -108,20 +108,20 @@ systemctl start docker
108108
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.
109109

110110
```sh
111-
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
111+
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
112112
```
113113

114114
### Also run the service proxy
115115
```sh
116-
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
116+
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
117117
```
118118

119119
### Test it out
120120
At this point, you should have a functioning 1-node cluster. Let's test it out!
121121

122122
Download the kubectl binary
123-
([OS X](http://storage.googleapis.com/kubernetes-release/release/v0.17.0/bin/darwin/amd64/kubectl))
124-
([linux](http://storage.googleapis.com/kubernetes-release/release/v0.17.0/bin/linux/amd64/kubectl))
123+
([OS X](http://storage.googleapis.com/kubernetes-release/release/v0.18.2/bin/darwin/amd64/kubectl))
124+
([linux](http://storage.googleapis.com/kubernetes-release/release/v0.18.2/bin/linux/amd64/kubectl))
125125

126126
List the nodes
127127

‎docs/getting-started-guides/docker-multinode/worker.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ systemctl start docker
9393
Again this is similar to the above, but the ```--api_servers``` now points to the master we set up in the beginning.
9494

9595
```sh
96-
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)
96+
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)
9797
```
9898

9999
#### Run the service proxy
100100
The service proxy provides load-balancing between groups of containers defined by Kubernetes ```Services```
101101

102102
```sh
103-
sudo docker run -d --net=host --privileged gcr.io/google_containers/hyperkube:v0.17.0 /hyperkube proxy --master=http://${MASTER_IP}:8080 --v=2
103+
sudo docker run -d --net=host --privileged gcr.io/google_containers/hyperkube:v0.18.2 /hyperkube proxy --master=http://${MASTER_IP}:8080 --v=2
104104
```
105105

106106

‎docs/getting-started-guides/docker.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ docker run --net=host -d gcr.io/google_containers/etcd:2.0.9 /usr/local/bin/etcd
1212

1313
### Step Two: Run the master
1414
```sh
15-
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
15+
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
1616
```
1717

1818
This actually runs the kubelet, which in turn runs a [pod](http://docs.k8s.io/pods.md) that contains the other master components.
1919

2020
### Step Three: Run the service proxy
2121
*Note, this could be combined with master above, but it requires --privileged for iptables manipulation*
2222
```sh
23-
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
23+
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
2424
```
2525

2626
### Test it out
2727
At this point you should have a running kubernetes cluster. You can test this by downloading the kubectl
2828
binary
29-
([OS X](https://storage.googleapis.com/kubernetes-release/release/v0.17.0/bin/darwin/amd64/kubectl))
30-
([linux](https://storage.googleapis.com/kubernetes-release/release/v0.17.0/bin/linux/amd64/kubectl))
29+
([OS X](https://storage.googleapis.com/kubernetes-release/release/v0.18.2/bin/darwin/amd64/kubectl))
30+
([linux](https://storage.googleapis.com/kubernetes-release/release/v0.18.2/bin/linux/amd64/kubectl))
3131

3232
*Note:*
3333
On OS/X you will need to set up port forwarding via ssh:

0 commit comments

Comments
 (0)