Merge pull request #91925 from wenjiaswe/etcdHostName

ETCD_NAME in migrate-if-needed.sh should be the same as etcd.manifest
This commit is contained in:
Kubernetes Prow Robot 2020-06-09 03:13:32 -07:00 committed by GitHub
commit 4cc44fbef6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -46,7 +46,7 @@ set -o nounset
BUNDLED_VERSIONS="3.0.17, 3.1.12, 3.2.24, 3.3.17, 3.4.7"
# shellcheck disable=SC2039
ETCD_NAME="${ETCD_NAME:-etcd-$HOSTNAME}"
ETCD_NAME="${ETCD_NAME:-etcd-${ETCD_HOSTNAME:-$(hostname -s)}}"
if [ -z "${DATA_DIRECTORY:-}" ]; then
echo "DATA_DIRECTORY variable unset - unexpected failure"
exit 1