Commit c2b0632b authored by CJ Cullen's avatar CJ Cullen

Merge pull request #4217 from pires/fix_coreos_master_portal_net

Fixed API server portal_net flag that could break service networking on CoreOS
parents d7e89f98 c48d5dd0
...@@ -121,7 +121,7 @@ coreos: ...@@ -121,7 +121,7 @@ coreos:
ExecStart=/opt/bin/kube-apiserver \ ExecStart=/opt/bin/kube-apiserver \
--address=0.0.0.0 \ --address=0.0.0.0 \
--port=8080 \ --port=8080 \
--portal_net=10.244.0.0/16 \ --portal_net=10.100.0.0/16 \
--etcd_servers=http://127.0.0.1:4001 \ --etcd_servers=http://127.0.0.1:4001 \
--public_address_override=$private_ipv4 \ --public_address_override=$private_ipv4 \
--logtostderr=true --logtostderr=true
......
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
" ExecStart=/opt/bin/kube-apiserver \\\n", " ExecStart=/opt/bin/kube-apiserver \\\n",
" --address=0.0.0.0 \\\n", " --address=0.0.0.0 \\\n",
" --port=8080 \\\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", " --etcd_servers=http://127.0.0.1:4001 \\\n",
" --public_address_override=$private_ipv4 \\\n", " --public_address_override=$private_ipv4 \\\n",
" --logtostderr=true\n", " --logtostderr=true\n",
......
...@@ -121,7 +121,7 @@ coreos: ...@@ -121,7 +121,7 @@ coreos:
ExecStart=/opt/bin/kube-apiserver \ ExecStart=/opt/bin/kube-apiserver \
--address=0.0.0.0 \ --address=0.0.0.0 \
--port=8080 \ --port=8080 \
--portal_net=10.244.0.0/16 \ --portal_net=10.100.0.0/16 \
--etcd_servers=http://127.0.0.1:4001 \ --etcd_servers=http://127.0.0.1:4001 \
--public_address_override=$private_ipv4 \ --public_address_override=$private_ipv4 \
--logtostderr=true --logtostderr=true
......
...@@ -81,7 +81,7 @@ coreos: ...@@ -81,7 +81,7 @@ coreos:
ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-apiserver ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-apiserver
ExecStart=/opt/bin/kube-apiserver \ ExecStart=/opt/bin/kube-apiserver \
--address=0.0.0.0 \ --address=0.0.0.0 \
--portal_net=10.244.0.0/16 \ --portal_net=10.100.0.0/16 \
--port=8080 \ --port=8080 \
--etcd_servers=http://127.0.0.1:4001 \ --etcd_servers=http://127.0.0.1:4001 \
--public_address_override=127.0.0.1 \ --public_address_override=127.0.0.1 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment