github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36741 from wojtek-t/fix_migration_ports

Browse Source 
Automatic merge from submit-queue

Fix ports in migration script

This may fix problems with migration that you observed.
This commit is contained in:
Kubernetes Submit Queue 2016-11-15 12:07:31 -08:00 committed by GitHub
commit 09a6da3207
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/images/etcd/migrate-if-needed.sh
View File

@ -101,12 +101,12 @@ fi
start_etcd() { start_etcd() {
# Use random ports, so that apiserver cannot connect to etcd. # Use random ports, so that apiserver cannot connect to etcd.
ETCD_PORT=18629 ETCD_PORT=18629
ETCD_PEER_PORT=18630 ETCD_PEER_PORT=2380
# Avoid collisions between etcd and event-etcd. # Avoid collisions between etcd and event-etcd.
case "${DATA_DIRECTORY}" in case "${DATA_DIRECTORY}" in
*event*) *event*)
ETCD_PORT=18631 ETCD_PORT=18631
ETCD_PEER_PORT=18632 ETCD_PEER_PORT=2381
;; ;;
esac esac
local ETCD_CMD="${ETCD:-/usr/local/bin/etcd-${START_VERSION}}" local ETCD_CMD="${ETCD:-/usr/local/bin/etcd-${START_VERSION}}"
@ -117,7 +117,8 @@ start_etcd() {
else else
ETCDCTL_CMD="${ETCDCTL_CMD} --endpoints=http://127.0.0.1:${ETCD_PORT} put" ETCDCTL_CMD="${ETCDCTL_CMD} --endpoints=http://127.0.0.1:${ETCD_PORT} put"
fi fi
${ETCD_CMD} --data-dir=${DATA_DIRECTORY} \ ${ETCD_CMD} --name="etcd-$(hostname)" \
--data-dir=${DATA_DIRECTORY} \
--listen-client-urls http://127.0.0.1:${ETCD_PORT} \ --listen-client-urls http://127.0.0.1:${ETCD_PORT} \
--advertise-client-urls http://127.0.0.1:${ETCD_PORT} \ --advertise-client-urls http://127.0.0.1:${ETCD_PORT} \
--listen-peer-urls http://127.0.0.1:${ETCD_PEER_PORT} \ --listen-peer-urls http://127.0.0.1:${ETCD_PEER_PORT} \