Merge pull request #5197 from erictune/coreos_fix_proxy

Kube-proxy to use apiserver instead of etcd in CoreOS getting-started-guide.
This commit is contained in:
Nikhil Jindal 2015-03-10 10:55:37 -07:00
commit 4805aecff8
4 changed files with 4 additions and 4 deletions

View File

@ -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/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 ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-proxy
ExecStart=/opt/bin/kube-proxy \ ExecStart=/opt/bin/kube-proxy \
--etcd_servers=http://<master-private-ip>:4001 \ --master=http://<master-private-ip>:8080 \
--logtostderr=true --logtostderr=true
Restart=always Restart=always
RestartSec=10 RestartSec=10

View File

@ -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/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", " ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-proxy\n",
" ExecStart=/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", " --logtostderr=true\n",
" Restart=always\n", " Restart=always\n",
" RestartSec=10\n", " RestartSec=10\n",

View File

@ -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/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 ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-proxy
ExecStart=/opt/bin/kube-proxy \ ExecStart=/opt/bin/kube-proxy \
--etcd_servers=http://<master-private-ip>:4001 \ --master=<master-private-ip>:8080 \
--logtostderr=true --logtostderr=true
Restart=always Restart=always
RestartSec=10 RestartSec=10

View File

@ -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/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 ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-proxy
ExecStart=/opt/bin/kube-proxy \ ExecStart=/opt/bin/kube-proxy \
--etcd_servers=http://127.0.0.1:4001 \ --master=<master-private-ip>:8080 \
--logtostderr=true --logtostderr=true
Restart=always Restart=always
RestartSec=10 RestartSec=10