Merge pull request #15288 from roberthbailey/hyperkube-config

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-08 14:20:54 -07:00
commit 27ff98c8f3
2 changed files with 2 additions and 2 deletions

View File

@ -21,7 +21,7 @@
"command": [ "command": [
"/hyperkube", "/hyperkube",
"apiserver", "apiserver",
"--portal-net=10.0.0.1/24", "--service-cluster-ip-range=10.0.0.1/24",
"--address=0.0.0.0", "--address=0.0.0.0",
"--etcd-servers=http://127.0.0.1:4001", "--etcd-servers=http://127.0.0.1:4001",
"--cluster-name=kubernetes", "--cluster-name=kubernetes",

View File

@ -21,7 +21,7 @@
"command": [ "command": [
"/hyperkube", "/hyperkube",
"apiserver", "apiserver",
"--portal-net=10.0.0.1/24", "--service-cluster-ip-range=10.0.0.1/24",
"--address=127.0.0.1", "--address=127.0.0.1",
"--etcd-servers=http://127.0.0.1:4001", "--etcd-servers=http://127.0.0.1:4001",
"--cluster-name=kubernetes", "--cluster-name=kubernetes",