github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #37193 from gmarek/event-disk 

Automatic merge from submit-queue

Pass GCLOUD_COMMON_ARGS do disk attach in Kubemark
pull/6/head
Kubernetes Submit Queue 2016-11-21 00:51:43 -08:00 committed by GitHub
parent ab184e1b1f 87f87206bc
commit da007483bd
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/kubemark/start-kubemark.sh
View File

@ -118,7 +118,10 @@ run-gcloud-compute-with-retries instances create "${MASTER_NAME}" \
if [ "${EVENT_PD:-false}" == "true" ]; then
echo "Attaching ${MASTER_NAME}-event-pd to ${MASTER_NAME}"
run-gcloud-compute-with-retries instances attach-disk "${MASTER_NAME}" --disk "${MASTER_NAME}-event-pd" --device-name="master-event-pd"
run-gcloud-compute-with-retries instances attach-disk "${MASTER_NAME}" \
${GCLOUD_COMMON_ARGS} \
--disk "${MASTER_NAME}-event-pd" \
--device-name="master-event-pd"
fi
run-gcloud-compute-with-retries firewall-rules create "${INSTANCE_PREFIX}-kubemark-master-https" \