From 0da9c3e3793a53610372e5dc6cca2786865f271c Mon Sep 17 00:00:00 2001
From: Wenjia Zhang <wenjiazhang@google.com>
Date: Thu, 18 Jun 2020 11:11:12 -0700
Subject: [PATCH] Add a comment to keep etcd name in sync and change `hostname`
 to `HOSTNAME`

---
 cluster/gce/manifests/etcd.manifest      | 3 +++
 cluster/images/etcd/migrate-if-needed.sh | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cluster/gce/manifests/etcd.manifest b/cluster/gce/manifests/etcd.manifest
index fd5370e8978..e55ceae68aa 100644
--- a/cluster/gce/manifests/etcd.manifest
+++ b/cluster/gce/manifests/etcd.manifest
@@ -53,6 +53,9 @@
       },
       { "name": "ETCD_SNAPSHOT_COUNT",
         "value": "10000"
+      },
+      { "name": "ETCD_HOSTNAME",
+        "value": "{{ hostname }}"
       }
         ],
     "livenessProbe": {
diff --git a/cluster/images/etcd/migrate-if-needed.sh b/cluster/images/etcd/migrate-if-needed.sh
index 15177c19283..04295ce2759 100755
--- a/cluster/images/etcd/migrate-if-needed.sh
+++ b/cluster/images/etcd/migrate-if-needed.sh
@@ -46,7 +46,8 @@ 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-${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