Skip to content

K
k3s
Commit 606a2dd0 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #36090 from wojtek-t/fix_migration_collisions

Automatic merge from submit-queue Fix collisions between different etcds during migration. Ref #20504
parents e8175946 5b038994
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
cluster/images/etcd/migrate-if-needed.sh
View file @ 606a2dd0
...@@ -102,6 +102,13 @@ start_etcd() { ...@@ -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)"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment