From 1e7cdf95bd4f688dd98f4cfe4db5bdf4780160d7 Mon Sep 17 00:00:00 2001
From: gmarek <gmarek@google.com>
Date: Fri, 2 Oct 2015 11:07:23 +0200
Subject: [PATCH] Add PROJECT to things added by SSL patch

---
 test/kubemark/start-kubemark.sh | 21 +++++++++++----------
 test/kubemark/stop-kubemark.sh  |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh
index 3125f1dac04..59b8d9b61aa 100755
--- a/test/kubemark/start-kubemark.sh
+++ b/test/kubemark/start-kubemark.sh
@@ -79,16 +79,17 @@ until gcloud compute ssh --zone="${ZONE}" --project="${PROJECT}" hollow-cluster-
   sleep 1
 done
 
-gcloud compute ssh --zone=${ZONE} hollow-cluster-master --command="sudo mkdir /srv/kubernetes -p && \
-sudo bash -c \"echo ${MASTER_CERT_BASE64} | base64 -d > /srv/kubernetes/server.cert\" && \
-sudo bash -c \"echo ${MASTER_KEY_BASE64} | base64 -d > /srv/kubernetes/server.key\" && \
-sudo bash -c \"echo ${CA_CERT_BASE64} | base64 -d > /srv/kubernetes/ca.crt\" && \
-sudo bash -c \"echo ${KUBECFG_CERT_BASE64} | base64 -d > /srv/kubernetes/kubecfg.crt\" && \
-sudo bash -c \"echo ${KUBECFG_KEY_BASE64} | base64 -d > /srv/kubernetes/kubecfg.key\" && \
-sudo bash -c \"echo \"${KUBE_BEARER_TOKEN},admin,admin\" > /srv/kubernetes/known_tokens.csv\" && \
-sudo bash -c \"echo \"${KUBELET_TOKEN},kubelet,kubelet\" >> /srv/kubernetes/known_tokens.csv\" && \
-sudo bash -c \"echo \"${KUBE_PROXY_TOKEN},kube_proxy,kube_proxy\" >> /srv/kubernetes/known_tokens.csv\" && \
-sudo bash -c \"echo admin,admin,admin > /srv/kubernetes/basic_auth.csv\""
+gcloud compute ssh --zone=${ZONE} --project="${PROJECT}" hollow-cluster-master \
+  --command="sudo mkdir /srv/kubernetes -p && \
+  sudo bash -c \"echo ${MASTER_CERT_BASE64} | base64 -d > /srv/kubernetes/server.cert\" && \
+  sudo bash -c \"echo ${MASTER_KEY_BASE64} | base64 -d > /srv/kubernetes/server.key\" && \
+  sudo bash -c \"echo ${CA_CERT_BASE64} | base64 -d > /srv/kubernetes/ca.crt\" && \
+  sudo bash -c \"echo ${KUBECFG_CERT_BASE64} | base64 -d > /srv/kubernetes/kubecfg.crt\" && \
+  sudo bash -c \"echo ${KUBECFG_KEY_BASE64} | base64 -d > /srv/kubernetes/kubecfg.key\" && \
+  sudo bash -c \"echo \"${KUBE_BEARER_TOKEN},admin,admin\" > /srv/kubernetes/known_tokens.csv\" && \
+  sudo bash -c \"echo \"${KUBELET_TOKEN},kubelet,kubelet\" >> /srv/kubernetes/known_tokens.csv\" && \
+  sudo bash -c \"echo \"${KUBE_PROXY_TOKEN},kube_proxy,kube_proxy\" >> /srv/kubernetes/known_tokens.csv\" && \
+  sudo bash -c \"echo admin,admin,admin > /srv/kubernetes/basic_auth.csv\""
 
 if [ "${RUN_FROM_DISTRO}" == "false" ]; then
   gcloud compute copy-files --zone="${ZONE}" --project="${PROJECT}" \
diff --git a/test/kubemark/stop-kubemark.sh b/test/kubemark/stop-kubemark.sh
index 5c1f0ccb5d7..ef9046f3848 100755
--- a/test/kubemark/stop-kubemark.sh
+++ b/test/kubemark/stop-kubemark.sh
@@ -38,4 +38,4 @@ gcloud compute disks delete \
       --zone "${ZONE}" \
       "${MASTER_NAME}"-pd || true
 
-rm -rf "kubeconfig.loc" &> /dev/null || true
+rm -rf "${KUBE_ROOT}/test/kubemark/kubeconfig.loc" &> /dev/null || true