github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Make etcd prefix configurable in migration script

Browse Source
This commit is contained in:
Wojciech Tyczynski 2017-09-01 15:49:45 +02:00
parent 6a845c67f0
commit 896d53c443
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,6 +82,7 @@ if [ -e "${DATA_DIRECTORY}/${VERSION_FILE}" ]; then
CURRENT_VERSION="$(echo $VERSION_CONTENTS | cut -d '/' -f 1)" CURRENT_VERSION="$(echo $VERSION_CONTENTS | cut -d '/' -f 1)"
CURRENT_STORAGE="$(echo $VERSION_CONTENTS | cut -d '/' -f 2)" CURRENT_STORAGE="$(echo $VERSION_CONTENTS | cut -d '/' -f 2)"
fi fi
ETCD_DATA_PREFIX="${ETCD_DATA_PREFIX:-/registry}"
# If there is no data in DATA_DIRECTORY, this means that we are # If there is no data in DATA_DIRECTORY, this means that we are
# starting etcd from scratch. In that case, we don't need to do # starting etcd from scratch. In that case, we don't need to do
@ -207,7 +208,7 @@ for step in ${SUPPORTED_VERSIONS}; do
# Create a lease and attach all keys to it. # Create a lease and attach all keys to it.
${ATTACHLEASE} \ ${ATTACHLEASE} \
--etcd-address http://127.0.0.1:${ETCD_PORT} \ --etcd-address http://127.0.0.1:${ETCD_PORT} \
--ttl-keys-prefix "${TTL_KEYS_DIRECTORY:-/registry/events}" \ --ttl-keys-prefix "${TTL_KEYS_DIRECTORY:-${ETCD_DATA_PREFIX}/events}" \
--lease-duration 1h --lease-duration 1h
# Kill etcd and wait until this is down. # Kill etcd and wait until this is down.
stop_etcd stop_etcd
@ -226,7 +227,7 @@ for step in ${SUPPORTED_VERSIONS}; do
echo "Starting etcd ${step} in v3 mode failed" echo "Starting etcd ${step} in v3 mode failed"
exit 1 exit 1
fi fi
${ETCDCTL_CMD} rm --recursive "/registry" ${ETCDCTL_CMD} rm --recursive "${ETCD_DATA_PREFIX}"
# Kill etcd and wait until this is down. # Kill etcd and wait until this is down.
stop_etcd stop_etcd
echo "Successfully remove v2 data" echo "Successfully remove v2 data"