From fc346b20865b6ca89f058a9dc78d35a2de30c292 Mon Sep 17 00:00:00 2001
From: wojtekt <wojtekt@google.com>
Date: Thu, 13 Dec 2018 11:50:49 +0100
Subject: [PATCH] Allow for configuring etcd servers addresses in kubemark

---
 cluster/gce/gci/configure-helper.sh              |  6 ++++--
 cluster/kubemark/gce/config-default.sh           |  2 ++
 test/kubemark/resources/start-kubemark-master.sh | 16 +++++++++-------
 test/kubemark/start-kubemark.sh                  |  2 ++
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
index d6550212ef..cbef5d438c 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -2845,8 +2845,10 @@ function main() {
 
   if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then
     compute-master-manifest-variables
-    start-etcd-servers
-    start-etcd-empty-dir-cleanup-pod
+    if [[ -z "${ETCD_SERVERS:-}" ]]; then
+      start-etcd-servers
+      start-etcd-empty-dir-cleanup-pod
+    fi
     start-kube-apiserver
     start-kube-controller-manager
     start-kube-scheduler
diff --git a/cluster/kubemark/gce/config-default.sh b/cluster/kubemark/gce/config-default.sh
index e80feb79bd..9f0f966925 100644
--- a/cluster/kubemark/gce/config-default.sh
+++ b/cluster/kubemark/gce/config-default.sh
@@ -66,6 +66,8 @@ ETCD_COMPACTION_INTERVAL_SEC="${KUBEMARK_ETCD_COMPACTION_INTERVAL_SEC:-}"
 # non-default version.
 ETCD_IMAGE="${TEST_ETCD_IMAGE:-}"
 ETCD_VERSION="${TEST_ETCD_VERSION:-}"
+ETCD_SERVERS="${KUBEMARK_ETCD_SERVERS:-}"
+ETCD_SERVERS_OVERRIDES="${KUBEMARK_ETCD_SERVERS_OVERRIDES:-}"
 
 # Storage backend. 'etcd2' and 'etcd3' are supported.
 STORAGE_BACKEND=${STORAGE_BACKEND:-}
diff --git a/test/kubemark/resources/start-kubemark-master.sh b/test/kubemark/resources/start-kubemark-master.sh
index 4f0aae5e25..9b813b19a1 100755
--- a/test/kubemark/resources/start-kubemark-master.sh
+++ b/test/kubemark/resources/start-kubemark-master.sh
@@ -489,11 +489,11 @@ function compute-etcd-events-params {
 function compute-kube-apiserver-params {
 	local params="${APISERVER_TEST_ARGS:-}"
 	params+=" --insecure-bind-address=0.0.0.0"
+	params+=" --etcd-servers=${ETCD_SERVERS:-http://127.0.0.1:2379}"
 	if [[ -z "${ETCD_SERVERS:-}" ]]; then
-		params+=" --etcd-servers=http://127.0.0.1:2379"
-		params+=" --etcd-servers-overrides=/events#${EVENT_STORE_URL}"
-	else
-		params+=" --etcd-servers=${ETCD_SERVERS}"
+		params+=" --etcd-servers-overrides=${ETCD_SERVERS_OVERRIDES:-/events#${EVENT_STORE_URL}}"
+	elif [[ -n "${ETCD_SERVERS_OVERRIDES:-}" ]]; then
+		params+=" --etcd-servers-overrides=${ETCD_SERVERS_OVERRIDES:-}"
 	fi
 	params+=" --tls-cert-file=/etc/srv/kubernetes/server.cert"
 	params+=" --tls-private-key-file=/etc/srv/kubernetes/server.key"
@@ -704,9 +704,11 @@ readonly audit_policy_file="/etc/audit_policy.config"
 
 # Start kubelet as a supervisord process and master components as pods.
 start-kubelet
-start-kubemaster-component "etcd"
-if [ "${EVENT_STORE_IP:-}" == "127.0.0.1" ]; then
-	start-kubemaster-component "etcd-events"
+if [[ -z "${ETCD_SERVERS:-}" ]]; then
+	start-kubemaster-component "etcd"
+	if [ "${EVENT_STORE_IP:-}" == "127.0.0.1" ]; then
+		start-kubemaster-component "etcd-events"
+	fi
 fi
 start-kubemaster-component "kube-apiserver"
 start-kubemaster-component "kube-controller-manager"
diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh
index 86b2183168..ddb17833f4 100755
--- a/test/kubemark/start-kubemark.sh
+++ b/test/kubemark/start-kubemark.sh
@@ -80,6 +80,8 @@ SCHEDULER_TEST_ARGS="${SCHEDULER_TEST_ARGS:-}"
 APISERVER_TEST_ARGS="${APISERVER_TEST_ARGS:-}"
 STORAGE_MEDIA_TYPE="${STORAGE_MEDIA_TYPE:-}"
 STORAGE_BACKEND="${STORAGE_BACKEND:-etcd3}"
+ETCD_SERVERS="${ETCD_SERVERS:-}"
+ETCD_SERVERS_OVERRIDES="${ETCD_SERVERS_OVERRIDES:-}"
 ETCD_COMPACTION_INTERVAL_SEC="${ETCD_COMPACTION_INTERVAL_SEC:-}"
 RUNTIME_CONFIG="${RUNTIME_CONFIG:-}"
 NUM_NODES="${NUM_NODES:-}"