github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #29458 from hongchaodeng/sh 

Automatic merge from submit-queue

Update etcd deprecated flag

update etcd deprecated flag
- "-addr" => "--advertise-client-urls"
- "-bind-addr" => "--listen-client-urls"
pull/6/head
k8s-merge-robot 2016-07-22 12:19:34 -07:00 committed by GitHub
parent df2cf16ddb 74e6626967
commit a6b8aa991e
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/gce/coreos/kube-manifests/etcd-events.yaml
View File

@ -10,8 +10,8 @@ spec:
- -c - -c
- /usr/local/bin/etcd - /usr/local/bin/etcd
--listen-peer-urls=http://127.0.0.1:2381 --listen-peer-urls=http://127.0.0.1:2381
--addr=127.0.0.1:4002 --advertise-client-urls=http://127.0.0.1:4002
--bind-addr=127.0.0.1:4002 --listen-client-urls=http://127.0.0.1:4002
--data-dir=/var/etcd/data-events --data-dir=/var/etcd/data-events
1>>/var/log/etcd-events.log 2>&1 1>>/var/log/etcd-events.log 2>&1
image: gcr.io/google_containers/etcd:2.2.1 image: gcr.io/google_containers/etcd:2.2.1

4
cluster/gce/coreos/kube-manifests/etcd.yaml
View File

@ -10,8 +10,8 @@ spec:
- -c - -c
- /usr/local/bin/etcd - /usr/local/bin/etcd
--listen-peer-urls=http://127.0.0.1:2380 --listen-peer-urls=http://127.0.0.1:2380
--addr=127.0.0.1:4001 --advertise-client-urls=http://127.0.0.1:4001
--bind-addr=127.0.0.1:4001 --listen-client-urls=http://127.0.0.1:4001
--data-dir=/var/etcd/data --data-dir=/var/etcd/data
1>>/var/log/etcd.log 2>&1 1>>/var/log/etcd.log 2>&1
image: gcr.io/google_containers/etcd:2.2.1 image: gcr.io/google_containers/etcd:2.2.1

2
cluster/saltbase/salt/etcd/etcd.manifest
View File

@ -19,7 +19,7 @@
"command": [ "command": [
"/bin/sh", "/bin/sh",
"-c", "-c",
"/usr/local/bin/etcd --listen-peer-urls http://127.0.0.1:{{ server_port }} --addr 127.0.0.1:{{ port }} --bind-addr 127.0.0.1:{{ port }} --data-dir /var/etcd/data{{ suffix }} 1>>/var/log/etcd{{ suffix }}.log 2>&1" "/usr/local/bin/etcd --listen-peer-urls http://127.0.0.1:{{ server_port }} --advertise-client-urls http://127.0.0.1:{{ port }} --listen-client-urls http://127.0.0.1:{{ port }} --data-dir /var/etcd/data{{ suffix }} 1>>/var/log/etcd{{ suffix }}.log 2>&1"
], ],
"livenessProbe": { "livenessProbe": {
"httpGet": { "httpGet": {

2
cluster/saltbase/salt/flannel-server/flannel-server.manifest
View File

@ -79,7 +79,7 @@
"command": [ "command": [
"/bin/sh", "/bin/sh",
"-c", "-c",
"/usr/local/bin/etcd --listen-peer-urls http://127.0.0.1:{{ etcd_peer_port }} --addr 127.0.0.1:{{ etcd_port }} --bind-addr 127.0.0.1:{{ etcd_port }} --data-dir /var/etcd-flannel/data 1>>/var/log/etcd_flannel.log 2>&1" "/usr/local/bin/etcd --listen-peer-urls http://127.0.0.1:{{ etcd_peer_port }} --advertise-client-urls http://127.0.0.1:{{ etcd_port }} --listen-client-urls http://127.0.0.1:{{ etcd_port }} --data-dir /var/etcd-flannel/data 1>>/var/log/etcd_flannel.log 2>&1"
], ],
"livenessProbe": { "livenessProbe": {
"httpGet": { "httpGet": {

4
hack/lib/etcd.sh
View File

@ -46,8 +46,8 @@ kube::etcd::start() {
else else
ETCD_LOGFILE=/dev/null ETCD_LOGFILE=/dev/null
fi fi
kube::log::info "etcd -addr ${ETCD_HOST}:${ETCD_PORT} -data-dir ${ETCD_DIR} --bind-addr ${ETCD_HOST}:${ETCD_PORT} --debug > \"${ETCD_LOGFILE}\" 2>/dev/null" kube::log::info "etcd --advertise-client-urls http://${ETCD_HOST}:${ETCD_PORT} --data-dir ${ETCD_DIR} --listen-client-urls http://${ETCD_HOST}:${ETCD_PORT} --debug > \"${ETCD_LOGFILE}\" 2>/dev/null"
etcd -addr ${ETCD_HOST}:${ETCD_PORT} -data-dir ${ETCD_DIR} --bind-addr ${ETCD_HOST}:${ETCD_PORT} --debug 2> "${ETCD_LOGFILE}" >/dev/null & etcd --advertise-client-urls http://${ETCD_HOST}:${ETCD_PORT} --data-dir ${ETCD_DIR} --listen-client-urls http://${ETCD_HOST}:${ETCD_PORT} --debug 2> "${ETCD_LOGFILE}" >/dev/null &
ETCD_PID=$! ETCD_PID=$!
echo "Waiting for etcd to come up." echo "Waiting for etcd to come up."

8
test/kubemark/start-kubemark-master.sh
View File

@ -21,15 +21,15 @@ EVENT_STORE_URL="http://${EVENT_STORE_IP}:4002"
if [ "${EVENT_STORE_IP}" == "127.0.0.1" ]; then if [ "${EVENT_STORE_IP}" == "127.0.0.1" ]; then
sudo docker run --net=host -d gcr.io/google_containers/etcd:2.2.1 /usr/local/bin/etcd \ sudo docker run --net=host -d gcr.io/google_containers/etcd:2.2.1 /usr/local/bin/etcd \
--listen-peer-urls http://127.0.0.1:2381 \ --listen-peer-urls http://127.0.0.1:2381 \
--addr=127.0.0.1:4002 \ --advertise-client-urls=http://127.0.0.1:4002 \
--bind-addr=0.0.0.0:4002 \ --listen-client-urls=http://0.0.0.0:4002 \
--data-dir=/var/etcd/data --data-dir=/var/etcd/data
fi fi
sudo docker run --net=host -d gcr.io/google_containers/etcd:2.2.1 /usr/local/bin/etcd \ sudo docker run --net=host -d gcr.io/google_containers/etcd:2.2.1 /usr/local/bin/etcd \
--listen-peer-urls http://127.0.0.1:2380 \ --listen-peer-urls http://127.0.0.1:2380 \
--addr=127.0.0.1:4001 \ --advertise-client-urls=http://127.0.0.1:4001 \
--bind-addr=0.0.0.0:4001 \ --listen-client-urls=http://0.0.0.0:4001 \
--data-dir=/var/etcd/data --data-dir=/var/etcd/data
# Increase the allowed number of open file descriptors # Increase the allowed number of open file descriptors

4
test/kubemark/start-kubemark.sh
View File

@ -132,8 +132,8 @@ if [ "${SEPARATE_EVENT_MACHINE:-false}" == "true" ]; then
gcloud compute ssh "${EVENT_STORE_NAME}" --zone="${ZONE}" --project="${PROJECT}" \ gcloud compute ssh "${EVENT_STORE_NAME}" --zone="${ZONE}" --project="${PROJECT}" \
--command="sudo docker run --net=host -d gcr.io/google_containers/etcd:2.0.12 /usr/local/bin/etcd \ --command="sudo docker run --net=host -d gcr.io/google_containers/etcd:2.0.12 /usr/local/bin/etcd \
--listen-peer-urls http://127.0.0.1:2380 \ --listen-peer-urls http://127.0.0.1:2380 \
--addr=127.0.0.1:4002 \ --advertise-client-urls=http://127.0.0.1:4002 \
--bind-addr=0.0.0.0:4002 \ --listen-client-urls=http://0.0.0.0:4002 \
--data-dir=/var/etcd/data" --data-dir=/var/etcd/data"
fi fi