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

Merge pull request #36090 from wojtek-t/fix_migration_collisions 

Automatic merge from submit-queue

Fix collisions between different etcds during migration.

Ref #20504
pull/6/head
Kubernetes Submit Queue 2016-11-03 02:47:03 -07:00 committed by GitHub
parent e817594648 5b0389948f
commit 606a2dd020
1 changed files with 7 additions and 0 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

@ -102,6 +102,13 @@ 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=18630
# Avoid collisions between etcd and event-etcd.
case "${DATA_DIRECTORY}" in
*event*)
ETCD_PORT=18631
ETCD_PEER_PORT=18632
;;
esac
local ETCD_CMD="${ETCD:-/usr/local/bin/etcd-${START_VERSION}}" local ETCD_CMD="${ETCD:-/usr/local/bin/etcd-${START_VERSION}}"
local ETCDCTL_CMD="${ETCDCTL:-/usr/local/bin/etcdctl-${START_VERSION}}" local ETCDCTL_CMD="${ETCDCTL:-/usr/local/bin/etcdctl-${START_VERSION}}"
local API_VERSION="$(echo ${START_STORAGE} | cut -c5-5)" local API_VERSION="$(echo ${START_STORAGE} | cut -c5-5)"