Merge pull request #2374 from serialx/master

Add missing Kubernetes proxy daemon to AWS CloudFormation template.
This commit is contained in:
Brendan Burns 2014-11-17 09:48:59 -08:00
commit 5fc485f0bc

View File

@ -194,6 +194,22 @@
" ExecStart=/opt/bin/scheduler --master=127.0.0.1:8080\n",
" Restart=always\n",
" RestartSec=10\n",
" - name: kube-proxy.service\n",
" command: start\n",
" content: |\n",
" [Unit]\n",
" Description=Kubernetes Proxy\n",
" Documentation=https://github.com/GoogleCloudPlatform/kubernetes\n",
" Requires=etcd.service\n",
" After=etcd.service\n\n",
" [Service]\n",
" ExecStartPre=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/k8s/proxy\n",
" ExecStartPre=/usr/bin/chmod +x /opt/bin/proxy\n",
" ExecStart=/opt/bin/proxy \\\n",
" --etcd_servers=http://127.0.0.1:4001 \\\n",
" --logtostderr=true\n",
" Restart=always\n",
" RestartSec=10\n",
" - name: kube-register.service\n",
" command: start\n",
" content: |\n",
@ -298,6 +314,22 @@
" --logtostderr=true\n",
" Restart=always\n",
" RestartSec=10\n",
" - name: kube-proxy.service\n",
" command: start\n",
" content: |\n",
" [Unit]\n",
" Description=Kubernetes Proxy\n",
" Documentation=https://github.com/GoogleCloudPlatform/kubernetes\n",
" Requires=setup-network-environment.service\n",
" After=setup-network-environment.service\n\n",
" [Service]\n",
" ExecStartPre=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/k8s/proxy\n",
" ExecStartPre=/usr/bin/chmod +x /opt/bin/proxy\n",
" ExecStart=/opt/bin/proxy \\\n",
" --etcd_servers=http://", {"Fn::GetAtt" :["KubernetesMasterInstance" , "PrivateIp"]}, ":4001\\\n",
" --logtostderr=true\n",
" Restart=always\n",
" RestartSec=10\n",
" update:\n",
" group: alpha\n",
" reboot-strategy: off\n"