github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-16 22:53:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9651 from brendandburns/rev-docker

Browse Source 
Update Docker instructions.
This commit is contained in:
Abhi Shah
2015-06-12 13:54:09 -07:00
parent 22a4d555c6 4b904c34a8
commit f345432b53
6 changed files with 19 additions and 19 deletions
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.17.0
VERSION=v0.18.2
all:
cp ../../saltbase/salt/helpers/safe_format_and_mount .

8
cluster/images/hyperkube/master-multi.json
View File

@@ -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",

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

@@ -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",