From c48d5dd09fed044e5035d8c90ff2bab0d673ad31 Mon Sep 17 00:00:00 2001 From: Paulo Pires Date: Fri, 6 Feb 2015 18:46:54 +0000 Subject: [PATCH] Fixed API server portal_net flag that could break service networking by setting an IP from a subnet allocated to a node. --- docs/getting-started-guides/aws/cloud-configs/master.yaml | 2 +- docs/getting-started-guides/aws/cloudformation-template.json | 2 +- docs/getting-started-guides/coreos/cloud-configs/master.yaml | 2 +- .../getting-started-guides/coreos/cloud-configs/standalone.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/getting-started-guides/aws/cloud-configs/master.yaml b/docs/getting-started-guides/aws/cloud-configs/master.yaml index 402b43ff577..af05afa92b5 100644 --- a/docs/getting-started-guides/aws/cloud-configs/master.yaml +++ b/docs/getting-started-guides/aws/cloud-configs/master.yaml @@ -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 diff --git a/docs/getting-started-guides/aws/cloudformation-template.json b/docs/getting-started-guides/aws/cloudformation-template.json index 510f9f155c0..0666688bb71 100644 --- a/docs/getting-started-guides/aws/cloudformation-template.json +++ b/docs/getting-started-guides/aws/cloudformation-template.json @@ -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", diff --git a/docs/getting-started-guides/coreos/cloud-configs/master.yaml b/docs/getting-started-guides/coreos/cloud-configs/master.yaml index a133dc7471e..9a059994d11 100644 --- a/docs/getting-started-guides/coreos/cloud-configs/master.yaml +++ b/docs/getting-started-guides/coreos/cloud-configs/master.yaml @@ -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 diff --git a/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml b/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml index 673a9d98b67..c43656f57f6 100644 --- a/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml +++ b/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml @@ -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 \