github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14776 from brendandburns/fixer2

Browse Source 
Fix some issues with the kubemark script
This commit is contained in:
Marek Grabowski 2015-09-30 08:58:15 +02:00
commit 7fa09abecb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,19 +47,19 @@ gcloud compute instances create ${MASTER_NAME} \
--scopes "storage-ro,compute-rw,logging-write" \ --scopes "storage-ro,compute-rw,logging-write" \
--disk "name=${MASTER_NAME}-pd,device-name=master-pd,mode=rw,boot=no,auto-delete=no" --disk "name=${MASTER_NAME}-pd,device-name=master-pd,mode=rw,boot=no,auto-delete=no"
MASTER_IP=`gcloud compute instances describe hollow-cluster-master | grep networkIP | cut -f2 -d":" | sed "s/ //g"` MASTER_IP=`gcloud compute instances describe hollow-cluster-master --zone=${ZONE} | grep networkIP | cut -f2 -d":" | sed "s/ //g"`
until gcloud compute ssh hollow-cluster-master --command="ls" &> /dev/null; do until gcloud compute ssh --zone=${ZONE} hollow-cluster-master --command="ls" &> /dev/null; do
sleep 1 sleep 1
done done
gcloud compute copy-files \ gcloud compute copy-files --zone=${ZONE} \
${KUBE_ROOT}/_output/release-tars/kubernetes-server-linux-amd64.tar.gz \ ${KUBE_ROOT}/_output/release-tars/kubernetes-server-linux-amd64.tar.gz \
${KUBE_ROOT}/test/kubemark/start-kubemark-master.sh \ ${KUBE_ROOT}/test/kubemark/start-kubemark-master.sh \
${KUBE_ROOT}/test/kubemark/configure-kubectl.sh \ ${KUBE_ROOT}/test/kubemark/configure-kubectl.sh \
hollow-cluster-master:~ hollow-cluster-master:~
gcloud compute ssh hollow-cluster-master --command="chmod a+x configure-kubectl.sh && chmod a+x start-kubemark-master.sh && ./start-kubemark-master.sh" gcloud compute ssh --zone=${ZONE} hollow-cluster-master --command="chmod a+x configure-kubectl.sh && chmod a+x start-kubemark-master.sh && ./start-kubemark-master.sh"
sed "s/##masterip##/\"${MASTER_IP}\"/g" ${KUBE_ROOT}/test/kubemark/hollow-kubelet_template.json > ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json sed "s/##masterip##/\"${MASTER_IP}\"/g" ${KUBE_ROOT}/test/kubemark/hollow-kubelet_template.json > ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json
sed -i'' -e "s/##numreplicas##/${NUM_MINIONS:-10}/g" ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json sed -i'' -e "s/##numreplicas##/${NUM_MINIONS:-10}/g" ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json