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

Merge pull request #41242 from wojtek-t/dont_always_backup 

Automatic merge from submit-queue (batch tested with PRs 41223, 40892, 41220, 41207, 41242)

Backup etcd only before migration

There is a bug currently that trigger backup on every run of a script (when we are running 2.2.1 version).

@mml
pull/6/head
Kubernetes Submit Queue 2017-02-10 13:35:47 -08:00 committed by GitHub
parent 3b7440ca9a 5c0c445b7b
commit b88b31cff4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,7 +152,7 @@ ROLLBACK="${ROLLBACK:-/usr/local/bin/rollback}"
# 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.
BACKUP_DIR="${DATA_DIRECTORY}/migration-backup"
if [ "${CURRENT_VERSION}" = "2.2.1" -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"
mkdir ${BACKUP_DIR}
ETCDCTL_CMD="/usr/local/bin/etcdctl-2.2.1"