github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #91964 from wenjiaswe/etcdNameComment

Browse Source 
Add a comment to keep etcd name in sync and change `hostname` to `HOSTNAME`
This commit is contained in:
Kubernetes Prow Robot 2020-06-18 19:05:40 -07:00 committed by GitHub
commit bfa6eb1772
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/gce/manifests/etcd.manifest
View File

@ -53,6 +53,9 @@
},
{ "name": "ETCD_SNAPSHOT_COUNT",
"value": "10000"
},
{ "name": "ETCD_HOSTNAME",
"value": "{{ hostname }}"
}
],
"livenessProbe": {

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

@ -46,7 +46,8 @@ set -o nounset
BUNDLED_VERSIONS="3.0.17, 3.1.12, 3.2.24, 3.3.17, 3.4.9"
# shellcheck disable=SC2039
ETCD_NAME="${ETCD_NAME:-etcd-${ETCD_HOSTNAME:-$(hostname -s)}}"
# NOTE: Make sure the resulted ETCD_NAME agrees with --name in etcd.manifest: https://github.com/kubernetes/kubernetes/blob/e7ca64fbe16d0c4b6c7b36aecde9cd75042b2828/cluster/gce/manifests/etcd.manifest#L27
ETCD_NAME="${ETCD_NAME:-etcd-${ETCD_HOSTNAME:-$HOSTNAME}}"
if [ -z "${DATA_DIRECTORY:-}" ]; then
echo "DATA_DIRECTORY variable unset - unexpected failure"
exit 1