Merge pull request #15377 from gmarek/fix-jenkins

cluster/kubemark/config-default.sh

@@ -33,9 +33,9 @@ MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150806}
 MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
 
 NETWORK=${KUBE_GCE_NETWORK:-default}
-INSTANCE_PREFIX="hollow-kubernetes"
-MASTER_NAME="hollow-cluster-master"
-MASTER_TAG="hollow-cluster-master"
+INSTANCE_PREFIX="${INSTANCE_PREFIX:-"default"}"
+MASTER_NAME="${INSTANCE_PREFIX}-kubemark-master"
+MASTER_TAG="kubemark-master"
 MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}"
 CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.244.0.0/16}"
 RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"

test/kubemark/run-scalability-test.sh

@@ -25,8 +25,7 @@ ABSOLUTE_ROOT=$(readlink -f ${KUBE_ROOT})
 source ${KUBE_ROOT}/cluster/kubemark/util.sh
 source ${KUBE_ROOT}/cluster/kubemark/config-default.sh
 
-echo ${KUBERNETES_PROVIDER}
-echo ${MASTER_NAME}
+echo "Kubemark master name: ${MASTER_NAME}"
 
 detect-master
 

test/kubemark/start-kubemark.sh

@@ -43,7 +43,8 @@ make
 rm kubemark
 cd $CURR_DIR
 
-MASTER_NAME="hollow-cluster-master"
+MASTER_NAME="${INSTANCE_PREFIX}-kubemark-master"
+MASTER_TAG="kubemark-master"
 
 gcloud compute disks create "${MASTER_NAME}-pd" \
     --project "${PROJECT}" \
@@ -62,14 +63,14 @@ gcloud compute instances create "${MASTER_NAME}" \
     --scopes "storage-ro,compute-rw,logging-write" \
     --disk "name=${MASTER_NAME}-pd,device-name=master-pd,mode=rw,boot=no,auto-delete=no"
 
-gcloud compute firewall-rules create "kubemark-master-https" \
+gcloud compute firewall-rules create "${INSTANCE_PREFIX}-kubemark-master-https" \
     --project "${PROJECT}" \
     --network "${NETWORK}" \
     --source-ranges "0.0.0.0/0" \
-    --target-tags "${MASTER_NAME}" \
+    --target-tags "${MASTER_TAG}" \
     --allow "tcp:443" || true
 
-MASTER_IP=$(gcloud compute instances describe hollow-cluster-master \
+MASTER_IP=$(gcloud compute instances describe ${MASTER_NAME} \
   --zone="${ZONE}" --project="${PROJECT}" | grep natIP: | cut -f2 -d":" | sed "s/ //g")
 
 ensure-temp-dir
@@ -82,11 +83,11 @@ echo "${CA_CERT_BASE64}" | base64 -d > ca.crt
 echo "${KUBECFG_CERT_BASE64}" | base64 -d > kubecfg.crt
 echo "${KUBECFG_KEY_BASE64}" | base64 -d > kubecfg.key
 
-until gcloud compute ssh --zone="${ZONE}" --project="${PROJECT}" hollow-cluster-master --command="ls" &> /dev/null; do
+until gcloud compute ssh --zone="${ZONE}" --project="${PROJECT}" ${MASTER_NAME} --command="ls" &> /dev/null; do
   sleep 1
 done
 
-gcloud compute ssh --zone=${ZONE} --project="${PROJECT}" hollow-cluster-master \
+gcloud compute ssh --zone=${ZONE} --project="${PROJECT}" ${MASTER_NAME} \
   --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\" && \
@@ -103,16 +104,16 @@ if [ "${RUN_FROM_DISTRO}" == "false" ]; then
     "${KUBE_ROOT}/_output/release-tars/kubernetes-server-linux-amd64.tar.gz" \
     "${KUBE_ROOT}/test/kubemark/start-kubemark-master.sh" \
     "${KUBE_ROOT}/test/kubemark/configure-kubectl.sh" \
-    "hollow-cluster-master":~
+    "${MASTER_NAME}":~
 else
   gcloud compute copy-files --zone="${ZONE}" --project="${PROJECT}" \
     "${KUBE_ROOT}/server/kubernetes-server-linux-amd64.tar.gz" \
     "${KUBE_ROOT}/test/kubemark/start-kubemark-master.sh" \
     "${KUBE_ROOT}/test/kubemark/configure-kubectl.sh" \
-    "hollow-cluster-master":~
+    "${MASTER_NAME}":~
 fi
 
-gcloud compute ssh hollow-cluster-master --zone=${ZONE} --project="${PROJECT}" \
+gcloud compute ssh ${MASTER_NAME} --zone=${ZONE} --project="${PROJECT}" \
   --command="chmod a+x configure-kubectl.sh && chmod a+x start-kubemark-master.sh && sudo ./start-kubemark-master.sh"
 
 # create kubeconfig for Kubelet:

test/kubemark/stop-kubemark.sh

@@ -22,7 +22,7 @@ source "${KUBE_ROOT}/cluster/kubemark/util.sh"
 
 detect-project &> /dev/null
 
-MASTER_NAME="hollow-cluster-master"
+MASTER_NAME="${INSTANCE_PREFIX:-"default"}-kubemark-master"
 
 kubectl delete -f ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json &> /dev/null || true
 kubectl delete -f ${KUBE_ROOT}/test/kubemark/kubemark-ns.json &> /dev/null || true