Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kube-proxy to use apiserver instead of etcd in CoreOS getting-started-guide. #5197

Merged
merged 2 commits into from
Mar 10, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/getting-started-guides/aws/cloud-configs/node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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://<master-private-ip>:4001 \
--master=http://<master-private-ip>:8080 \
--logtostderr=true
Restart=always
RestartSec=10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started-guides/coreos/cloud-configs/node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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://<master-private-ip>:4001 \
--master=<master-private-ip>:8080 \
--logtostderr=true
Restart=always
RestartSec=10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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=<master-private-ip>:8080 \
--logtostderr=true
Restart=always
RestartSec=10
Expand Down