Skip to content

K
k3s
Commit e050e7a8 authored by Wojciech Tyczynski's avatar Wojciech Tyczynski
Browse files
Options

Fix etcd migration for HA clusters

parent 42a73ee3
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
cluster/images/etcd/migrate-if-needed.sh
View file @ e050e7a8
...@@ -122,7 +122,6 @@ start_etcd() { ...@@ -122,7 +122,6 @@ start_etcd() {
${ETCD_CMD} \ ${ETCD_CMD} \
--name="etcd-$(hostname)" \ --name="etcd-$(hostname)" \
--debug \ --debug \
--force-new-cluster \
--data-dir=${DATA_DIRECTORY} \ --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} \
...@@ -154,7 +153,7 @@ ROLLBACK="${ROLLBACK:-/usr/local/bin/rollback}" ...@@ -154,7 +153,7 @@ ROLLBACK="${ROLLBACK:-/usr/local/bin/rollback}"
# If we are upgrading from 2.2.1 and this is the first try for upgrade, # If we are upgrading from 2.2.1 and this is the first try for upgrade,
# do the backup to allow restoring from it in case of failed upgrade. # do the backup to allow restoring from it in case of failed upgrade.
BACKUP_DIR="${DATA_DIRECTORY}/migration-backup" BACKUP_DIR="${DATA_DIRECTORY}/migration-backup"
if [ "${CURRENT_VERSION}" = "2.2.1" -a ! "${CURRENT_VERSION}" != "${TARGET_VERSION}" -a -d "${BACKUP_DIR}" ]; then if [ "${CURRENT_VERSION}" = "2.2.1" -a "${CURRENT_VERSION}" != "${TARGET_VERSION}" -a ! -d "${BACKUP_DIR}" ]; then
echo "Backup etcd before starting migration" echo "Backup etcd before starting migration"
mkdir ${BACKUP_DIR} mkdir ${BACKUP_DIR}
ETCDCTL_CMD="/usr/local/bin/etcdctl-2.2.1" ETCDCTL_CMD="/usr/local/bin/etcdctl-2.2.1"
......
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