Merge pull request #53977 from shyamjvs/kubemark-events-pd

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Make EVENT_PD variable useful for kubemark /cc @wojtek-t

Merge pull request #53977 from shyamjvs/kubemark-events-pd
4a6fec73 · Kubernetes Submit Queue · GitHub · 1ab5075c · 40c245e5 · 4a6fec73
Commit 4a6fec73 authored Oct 16, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 16, 2017
4 changed files
--- a/cluster/kubemark/gce/config-default.sh
+++ b/cluster/kubemark/gce/config-default.sh
@@ -33,6 +33,7 @@ REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false}
 PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}
 NODE_ACCELERATORS=${NODE_ACCELERATORS:-""}
 CREATE_CUSTOM_NETWORK=${CREATE_CUSTOM_NETWORK:-false}
+EVENT_PD=${EVENT_PD:-false}
 MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-gci}
 NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-gci}

--- a/test/kubemark/gce/util.sh
+++ b/test/kubemark/gce/util.sh
@@ -33,7 +33,7 @@ function create-master-instance-with-resources {
    --type "${MASTER_DISK_TYPE}" \
    --size "${MASTER_DISK_SIZE}"
-  if [ "${EVENT_PD:-false}" == "true" ]; then
+  if [ "${EVENT_PD:-}" == "true" ]; then
    run-gcloud-compute-with-retries disks create "${MASTER_NAME}-event-pd" \
      ${GCLOUD_COMMON_ARGS} \
      --type "${MASTER_DISK_TYPE}" \
@@ -70,7 +70,7 @@ function create-master-instance-with-resources {
    ${GCLOUD_COMMON_ARGS} \
    --metadata-from-file startup-script="${KUBE_ROOT}/test/kubemark/resources/start-kubemark-master.sh"
-  if [ "${EVENT_PD:-false}" == "true" ]; then
+  if [ "${EVENT_PD:-}" == "true" ]; then
    echo "Attaching ${MASTER_NAME}-event-pd to ${MASTER_NAME}"
    run-gcloud-compute-with-retries instances attach-disk "${MASTER_NAME}" \
    ${GCLOUD_COMMON_ARGS} \

--- a/test/kubemark/resources/start-kubemark-master.sh
+++ b/test/kubemark/resources/start-kubemark-master.sh
@@ -681,8 +681,7 @@ fi
 {
 	EVENT_STORE_IP="${EVENT_STORE_IP:-127.0.0.1}"
 	EVENT_STORE_URL="${EVENT_STORE_URL:-http://${EVENT_STORE_IP}:4002}"
-	EVENT_PD="${EVENT_PD:-false}"
+	if [ "${EVENT_PD:-}" == "true" ]; then
-	if [ "${EVENT_PD:-false}" == "true" ]; then
 		event_etcd_mount_point="/mnt/disks/master-event-pd"
 		mount-pd "google-master-event-pd" "${event_etcd_mount_point}"
 		# Contains all the data stored in event etcd.

--- a/test/kubemark/start-kubemark.sh
+++ b/test/kubemark/start-kubemark.sh
@@ -52,6 +52,7 @@ function create-master-environment-file {
 # Generic variables.
 INSTANCE_PREFIX="${INSTANCE_PREFIX:-}"
 SERVICE_CLUSTER_IP_RANGE="${SERVICE_CLUSTER_IP_RANGE:-}"
+EVENT_PD="${EVENT_PD:-}"
 # Etcd related variables.
 ETCD_IMAGE="${ETCD_IMAGE:-3.1.10}"