Merge pull request #4217 from pires/fix_coreos_master_portal_net

Fixed API server portal_net flag that could break service networking on CoreOS
This commit is contained in:
CJ Cullen 2015-02-11 10:15:46 -08:00
commit c2b0632be4
4 changed files with 4 additions and 4 deletions

View File

@ -121,7 +121,7 @@ coreos:
ExecStart=/opt/bin/kube-apiserver \
--address=0.0.0.0 \
--port=8080 \
--portal_net=10.244.0.0/16 \
--portal_net=10.100.0.0/16 \
--etcd_servers=http://127.0.0.1:4001 \
--public_address_override=$private_ipv4 \
--logtostderr=true

View File

@ -247,7 +247,7 @@
" ExecStart=/opt/bin/kube-apiserver \\\n",
" --address=0.0.0.0 \\\n",
" --port=8080 \\\n",
" --portal_net=10.244.0.0/16 \\\n",
" --portal_net=10.100.0.0/16 \\\n",
" --etcd_servers=http://127.0.0.1:4001 \\\n",
" --public_address_override=$private_ipv4 \\\n",
" --logtostderr=true\n",

View File

@ -121,7 +121,7 @@ coreos:
ExecStart=/opt/bin/kube-apiserver \
--address=0.0.0.0 \
--port=8080 \
--portal_net=10.244.0.0/16 \
--portal_net=10.100.0.0/16 \
--etcd_servers=http://127.0.0.1:4001 \
--public_address_override=$private_ipv4 \
--logtostderr=true

View File

@ -81,7 +81,7 @@ coreos:
ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-apiserver
ExecStart=/opt/bin/kube-apiserver \
--address=0.0.0.0 \
--portal_net=10.244.0.0/16 \
--portal_net=10.100.0.0/16 \
--port=8080 \
--etcd_servers=http://127.0.0.1:4001 \
--public_address_override=127.0.0.1 \