From d9e89ca9955e37bb0e82d66a2adc51eacec28886 Mon Sep 17 00:00:00 2001 From: Eric Tune Date: Mon, 9 Mar 2015 11:32:16 -0700 Subject: [PATCH 1/2] Kube-proxy to use apiserver instead of etcd. --- docs/getting-started-guides/aws/cloud-configs/node.yaml | 2 +- docs/getting-started-guides/coreos/cloud-configs/node.yaml | 2 +- .../getting-started-guides/coreos/cloud-configs/standalone.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/getting-started-guides/aws/cloud-configs/node.yaml b/docs/getting-started-guides/aws/cloud-configs/node.yaml index ff4a1415a77cf..e7f5fb6302d13 100644 --- a/docs/getting-started-guides/aws/cloud-configs/node.yaml +++ b/docs/getting-started-guides/aws/cloud-configs/node.yaml @@ -77,7 +77,7 @@ coreos: ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.11.0/bin/linux/amd64/kube-proxy ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-proxy ExecStart=/opt/bin/kube-proxy \ - --etcd_servers=http://:4001 \ + --master=http://:8080 \ --logtostderr=true Restart=always RestartSec=10 diff --git a/docs/getting-started-guides/coreos/cloud-configs/node.yaml b/docs/getting-started-guides/coreos/cloud-configs/node.yaml index dafef929cd7f3..39d166806a850 100644 --- a/docs/getting-started-guides/coreos/cloud-configs/node.yaml +++ b/docs/getting-started-guides/coreos/cloud-configs/node.yaml @@ -77,7 +77,7 @@ coreos: ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.11.0/bin/linux/amd64/kube-proxy ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-proxy ExecStart=/opt/bin/kube-proxy \ - --etcd_servers=http://:4001 \ + --master=:8080 \ --logtostderr=true Restart=always RestartSec=10 diff --git a/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml b/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml index 95aefcc4b61dd..049715cc1f6b4 100644 --- a/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml +++ b/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml @@ -133,7 +133,7 @@ coreos: ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.11.0/bin/linux/amd64/kube-proxy ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-proxy ExecStart=/opt/bin/kube-proxy \ - --etcd_servers=http://127.0.0.1:4001 \ + --master=:8080 \ --logtostderr=true Restart=always RestartSec=10 From 35ebf718e8ec19aba72ac7a0e7541c212b1e6aae Mon Sep 17 00:00:00 2001 From: Eric Tune Date: Mon, 9 Mar 2015 17:52:05 -0700 Subject: [PATCH 2/2] Fix CloudFormation too. --- docs/getting-started-guides/aws/cloudformation-template.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started-guides/aws/cloudformation-template.json b/docs/getting-started-guides/aws/cloudformation-template.json index 7cac37cade9be..b789afacd9f71 100644 --- a/docs/getting-started-guides/aws/cloudformation-template.json +++ b/docs/getting-started-guides/aws/cloudformation-template.json @@ -401,7 +401,7 @@ " ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.11.0/bin/linux/amd64/kube-proxy\n", " ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-proxy\n", " ExecStart=/opt/bin/kube-proxy \\\n", - " --etcd_servers=http://", {"Fn::GetAtt" :["KubernetesMasterInstance" , "PrivateIp"]}, ":4001\\\n", + " --master=http://", {"Fn::GetAtt" :["KubernetesMasterInstance" , "PrivateIp"]}, ":8080\\\n", " --logtostderr=true\n", " Restart=always\n", " RestartSec=10\n",