From a2c2f7d8f7f4c3f49fab2fc804d0e958a0fe21a2 Mon Sep 17 00:00:00 2001
From: Filip Grzadkowski <filipg@google.com>
Date: Thu, 21 Jul 2016 21:03:18 +0200
Subject: [PATCH] Add static IP address for kubemark master.

---
 test/kubemark/start-kubemark.sh | 12 +++++++++---
 test/kubemark/stop-kubemark.sh  |  6 ++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh
index 2901ad489c1..abf13c0831a 100755
--- a/test/kubemark/start-kubemark.sh
+++ b/test/kubemark/start-kubemark.sh
@@ -80,8 +80,17 @@ run-gcloud-compute-with-retries disks create "${MASTER_NAME}-pd" \
   --type "${MASTER_DISK_TYPE}" \
   --size "${MASTER_DISK_SIZE}"
 
+REGION=${ZONE%-*}
+run-gcloud-compute-with-retries addresses create "${MASTER_NAME}-ip" \
+  --project "${PROJECT}" \
+  --region "${REGION}" -q
+
+MASTER_IP=$(gcloud compute addresses describe "${MASTER_NAME}-ip" \
+  --project "${PROJECT}" --region "${REGION}" -q --format='value(address)')
+
 run-gcloud-compute-with-retries instances create "${MASTER_NAME}" \
   ${GCLOUD_COMMON_ARGS} \
+  --address "${MASTER_IP}"
   --machine-type "${MASTER_SIZE}" \
   --image-project="${MASTER_IMAGE_PROJECT}" \
   --image "${MASTER_IMAGE}" \
@@ -97,9 +106,6 @@ run-gcloud-compute-with-retries firewall-rules create "${INSTANCE_PREFIX}-kubema
   --target-tags "${MASTER_TAG}" \
   --allow "tcp:443"
 
-MASTER_IP=$(gcloud compute instances describe ${MASTER_NAME} \
-  --zone="${ZONE}" --project="${PROJECT}" | grep natIP: | cut -f2 -d":" | sed "s/ //g")
-
 if [ "${SEPARATE_EVENT_MACHINE:-false}" == "true" ]; then
   EVENT_STORE_NAME="${INSTANCE_PREFIX}-event-store"
     run-gcloud-compute-with-retries disks create "${EVENT_STORE_NAME}-pd" \
diff --git a/test/kubemark/stop-kubemark.sh b/test/kubemark/stop-kubemark.sh
index 6c01fa61051..c60e0a13cd1 100755
--- a/test/kubemark/stop-kubemark.sh
+++ b/test/kubemark/stop-kubemark.sh
@@ -32,6 +32,12 @@ gcloud compute instances delete "${MASTER_NAME}" \
 gcloud compute disks delete "${MASTER_NAME}-pd" \
     ${GCLOUD_COMMON_ARGS} || true
 
+REGION=${ZONE%-*}
+gcloud compute addresses delete "${MASTER_NAME}-ip" \
+    --project "${PROJECT}" \
+    --region "${REGION}" \
+    --quiet || true
+
 gcloud compute firewall-rules delete "${INSTANCE_PREFIX}-kubemark-master-https" \
 	--project "${PROJECT}" \
 	--quiet || true