mirror of https://github.com/k3s-io/k3s
Start testing etcd2->etcd3 migration in test-update-storage-objects
parent
19e50d56dc
commit
0e61d817c5
|
@ -157,15 +157,14 @@ killApiServer
|
|||
# We always perform offline migration, so we need to stop etcd.
|
||||
#######################################################
|
||||
|
||||
# TODO: Uncomment once we support migration.
|
||||
#kube::etcd::stop
|
||||
#TARGET_STORAGE="etcd3" \
|
||||
# DATA_DIRECTORY="${ETCD_DIR}" \
|
||||
# ETCD=$(which etcd) \
|
||||
# ETCDCTL=$(which etcdctl) \
|
||||
# ATTACHLEASE="${KUBE_OUTPUT_HOSTBIN}/attachlease" \
|
||||
# ${KUBE_ROOT}/cluster/images/etcd/migrate-if-needed.sh
|
||||
#kube::etcd::start
|
||||
kube::etcd::stop
|
||||
TARGET_STORAGE="etcd3" \
|
||||
DATA_DIRECTORY="${ETCD_DIR}" \
|
||||
ETCD=$(which etcd) \
|
||||
ETCDCTL=$(which etcdctl) \
|
||||
ATTACHLEASE="${KUBE_OUTPUT_HOSTBIN}/attachlease" \
|
||||
${KUBE_ROOT}/cluster/images/etcd/migrate-if-needed.sh
|
||||
kube::etcd::start
|
||||
|
||||
|
||||
#######################################################
|
||||
|
@ -176,8 +175,7 @@ killApiServer
|
|||
|
||||
KUBE_API_VERSIONS="${KUBE_NEW_API_VERSION},${KUBE_OLD_API_VERSION}"
|
||||
RUNTIME_CONFIG="api/all=false,api/${KUBE_OLD_API_VERSION}=true,api/${KUBE_NEW_API_VERSION}=true"
|
||||
# TODO: Switch to STORAGE_BACKEND_ETCD3 once we support it.
|
||||
startApiServer ${STORAGE_BACKEND_ETCD2} ${KUBE_NEW_STORAGE_VERSIONS} ${KUBE_STORAGE_MEDIA_TYPE_JSON}
|
||||
startApiServer ${STORAGE_BACKEND_ETCD3} ${KUBE_NEW_STORAGE_VERSIONS} ${KUBE_STORAGE_MEDIA_TYPE_JSON}
|
||||
|
||||
# Update etcd objects, so that will now be stored in the new api version.
|
||||
kube::log::status "Updating storage versions in etcd"
|
||||
|
@ -192,8 +190,7 @@ for test in ${tests[@]}; do
|
|||
new_storage_version=${test_data[5]}
|
||||
|
||||
kube::log::status "Verifying ${resource}/${namespace}/${name} has updated storage version ${new_storage_version} in etcd"
|
||||
# note that should use flag --endpoints for etcdctl 3
|
||||
${ETCDCTL} --endpoint="${ETCD_HOST}:${ETCD_PORT}" get "/${ETCD_PREFIX}/${resource}/${namespace}/${name}" | grep ${new_storage_version}
|
||||
ETCDCTL_API=3 ${ETCDCTL} --endpoints="${ETCD_HOST}:${ETCD_PORT}" get "/${ETCD_PREFIX}/${resource}/${namespace}/${name}" | grep ${new_storage_version}
|
||||
done
|
||||
|
||||
killApiServer
|
||||
|
@ -209,8 +206,7 @@ RUNTIME_CONFIG="api/all=false,api/${KUBE_NEW_API_VERSION}=true"
|
|||
|
||||
# This seems to reduce flakiness.
|
||||
sleep 1
|
||||
# TODO: Switch to STORAGE_BACKEND_ETCD3 once we support it.
|
||||
startApiServer ${STORAGE_BACKEND_ETCD2} ${KUBE_NEW_STORAGE_VERSIONS} ${KUBE_STORAGE_MEDIA_TYPE_PROTOBUF}
|
||||
startApiServer ${STORAGE_BACKEND_ETCD3} ${KUBE_NEW_STORAGE_VERSIONS} ${KUBE_STORAGE_MEDIA_TYPE_PROTOBUF}
|
||||
|
||||
for test in ${tests[@]}; do
|
||||
IFS=',' read -ra test_data <<<"$test"
|
||||
|
|
Loading…
Reference in New Issue