From 10b39d9dd74aacbe57eefbe927fa9ac3064f93fb Mon Sep 17 00:00:00 2001
From: Shyam Jeedigunta <shyamjvs@google.com>
Date: Wed, 14 Dec 2016 17:30:24 +0100
Subject: [PATCH 1/2] Fixed kubemark to work when ETCD_X flags are set

---
 test/kubemark/start-kubemark.sh | 33 +++++++++++++--------------------
 test/kubemark/stop-kubemark.sh  |  4 +---
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh
index 58aa0be5746..4516ef434b5 100755
--- a/test/kubemark/start-kubemark.sh
+++ b/test/kubemark/start-kubemark.sh
@@ -25,35 +25,28 @@ source "${KUBE_ROOT}/test/kubemark/common.sh"
 function writeEnvironmentFile() {
   cat > "${RESOURCE_DIRECTORY}/kubemark-master-env.sh" <<EOF
 # Generic variables.
-INSTANCE_PREFIX=${INSTANCE_PREFIX}
-SERVICE_CLUSTER_IP_RANGE=${SERVICE_CLUSTER_IP_RANGE}
+INSTANCE_PREFIX="${INSTANCE_PREFIX:-}"
+SERVICE_CLUSTER_IP_RANGE="${SERVICE_CLUSTER_IP_RANGE:-}"
 
 # Etcd related variables.
-ETCD_IMAGE=2.2.1
+ETCD_IMAGE="${ETCD_IMAGE:-}"
+ETCD_VERSION="${ETCD_VERSION:-}"
 
 # Controller-manager related variables.
-CONTROLLER_MANAGER_TEST_ARGS="${CONTROLLER_MANAGER_TEST_ARGS}"
-ALLOCATE_NODE_CIDRS=${ALLOCATE_NODE_CIDRS}
-CLUSTER_IP_RANGE=${CLUSTER_IP_RANGE}
-TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD}
+CONTROLLER_MANAGER_TEST_ARGS="${CONTROLLER_MANAGER_TEST_ARGS:-}"
+ALLOCATE_NODE_CIDRS="${ALLOCATE_NODE_CIDRS:-}"
+CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-}"
+TERMINATED_POD_GC_THRESHOLD="${TERMINATED_POD_GC_THRESHOLD:-}"
 
 # Scheduler related variables.
-SCHEDULER_TEST_ARGS="${SCHEDULER_TEST_ARGS}"
+SCHEDULER_TEST_ARGS="${SCHEDULER_TEST_ARGS:-}"
 
 # Apiserver related variables.
-APISERVER_TEST_ARGS="${APISERVER_TEST_ARGS}"
-STORAGE_BACKEND=${STORAGE_BACKEND}
-NUM_NODES=${NUM_NODES}
+APISERVER_TEST_ARGS="${APISERVER_TEST_ARGS:-}"
+STORAGE_BACKEND="${STORAGE_BACKEND:-}"
+NUM_NODES="${NUM_NODES:-}"
+CUSTOM_ADMISSION_PLUGINS="${CUSTOM_ADMISSION_PLUGINS:-NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota}"
 EOF
-if [ -z "${CUSTOM_ADMISSION_PLUGINS:-}" ]; then
-  cat >> "${RESOURCE_DIRECTORY}/kubemark-master-env.sh" <<EOF
-CUSTOM_ADMISSION_PLUGINS=NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota
-EOF
-else
-  cat >> "${RESOURCE_DIRECTORY}/kubemark-master-env.sh" <<EOF
-CUSTOM_ADMISSION_PLUGINS=${CUSTOM_ADMISSION_PLUGINS}
-EOF
-fi
 }
 
 MAKE_DIR="${KUBE_ROOT}/cluster/images/kubemark"
diff --git a/test/kubemark/stop-kubemark.sh b/test/kubemark/stop-kubemark.sh
index 0d894250aaa..0ee2477deff 100755
--- a/test/kubemark/stop-kubemark.sh
+++ b/test/kubemark/stop-kubemark.sh
@@ -57,6 +57,4 @@ rm "${RESOURCE_DIRECTORY}/ca.crt" \
 	"${RESOURCE_DIRECTORY}/kubecfg.crt" \
 	"${RESOURCE_DIRECTORY}/kubecfg.key" \
 	"${RESOURCE_DIRECTORY}/hollow-node.json" \
-	"${RESOURCE_DIRECTORY}/apiserver_flags" \
-	"${RESOURCE_DIRECTORY}/controllers_flags" \
-	"${RESOURCE_DIRECTORY}/scheduler_flags" &> /dev/null || true
+	"${RESOURCE_DIRECTORY}/kubemark-master-env.sh"  &> /dev/null || true

From 40907930a3f34de9b033d8bec034c40dbdf922da Mon Sep 17 00:00:00 2001
From: gmarek <gmarek@google.com>
Date: Thu, 15 Dec 2016 10:25:33 +0100
Subject: [PATCH 2/2] Fix the kubemark fix

---
 test/kubemark/common.sh         | 8 ++++----
 test/kubemark/start-kubemark.sh | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/kubemark/common.sh b/test/kubemark/common.sh
index 9c0cd375eed..a886115dc8f 100644
--- a/test/kubemark/common.sh
+++ b/test/kubemark/common.sh
@@ -22,12 +22,12 @@ source "${KUBE_ROOT}/cluster/lib/util.sh"
 # what what is default in hack/lib/etcd.sh
 # To avoid it, if it is empty, we set it to 'avoid-overwrite' and
 # clean it after that.
-if [ -z "${ETCD_IMAGE}" ]; then
-  ETCD_IMAGE="avoid-overwrite"
+if [ -z "${ETCD_VERSION:-}" ]; then
+  ETCD_VERSION="avoid-overwrite"
 fi
 source "${KUBE_ROOT}/hack/lib/init.sh"
-if [ "${ETCD_IMAGE}" == "avoid-overwrite" ]; then
-  ETCD_IMAGE=""
+if [ "${ETCD_VERSION:-}" == "avoid-overwrite" ]; then
+  ETCD_VERSION=""
 fi
 
 detect-project &> /dev/null
diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh
index 4516ef434b5..37fa59c2516 100755
--- a/test/kubemark/start-kubemark.sh
+++ b/test/kubemark/start-kubemark.sh
@@ -29,7 +29,7 @@ INSTANCE_PREFIX="${INSTANCE_PREFIX:-}"
 SERVICE_CLUSTER_IP_RANGE="${SERVICE_CLUSTER_IP_RANGE:-}"
 
 # Etcd related variables.
-ETCD_IMAGE="${ETCD_IMAGE:-}"
+ETCD_IMAGE="${ETCD_IMAGE:-2.2.1}"
 ETCD_VERSION="${ETCD_VERSION:-}"
 
 # Controller-manager related variables.
@@ -49,6 +49,8 @@ CUSTOM_ADMISSION_PLUGINS="${CUSTOM_ADMISSION_PLUGINS:-NamespaceLifecycle,LimitRa
 EOF
 }
 
+writeEnvironmentFile
+
 MAKE_DIR="${KUBE_ROOT}/cluster/images/kubemark"
 
 KUBEMARK_BIN="$(kube::util::find-binary-for-platform kubemark linux/amd64)"
@@ -154,7 +156,6 @@ gcloud compute ssh --zone="${ZONE}" --project="${PROJECT}" "${MASTER_NAME}" \
     sudo bash -c \"echo \"${KUBE_PROXY_TOKEN},kube_proxy,kube_proxy\" >> /srv/kubernetes/known_tokens.csv\" && \
     sudo bash -c \"echo ${password},admin,admin > /srv/kubernetes/basic_auth.csv\""
 
-writeEnvironmentFile
 
 gcloud compute copy-files --zone="${ZONE}" --project="${PROJECT}" \
   "${SERVER_BINARY_TAR}" \