github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30269 from wojtek-t/set_cache_size_in_kubemark

Browse Source 
Automatic merge from submit-queue

Set cache size in Kubemark

Fix #27142
This commit is contained in:
Kubernetes Submit Queue 2016-08-09 05:08:32 -07:00 committed by GitHub
commit ae405437e1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/kubemark/start-kubemark-master.sh
View File

@ -18,6 +18,7 @@
EVENT_STORE_IP=$1
EVENT_STORE_URL="http://${EVENT_STORE_IP}:4002"
NUM_NODES=$2
if [ "${EVENT_STORE_IP}" == "127.0.0.1" ]; then
sudo docker run --net=host -d gcr.io/google_containers/etcd:2.2.1 /usr/local/bin/etcd \
--listen-peer-urls http://127.0.0.1:2381 \
@ -49,6 +50,7 @@ kubernetes/server/bin/kube-apiserver \
--token-auth-file=/srv/kubernetes/known_tokens.csv \
--secure-port=443 \
--basic-auth-file=/srv/kubernetes/basic_auth.csv \
--target-ram-mb=$((${NUM_NODES} * 60)) \
$(cat apiserver_flags) &> /var/log/kube-apiserver.log &
# kube-contoller-manager now needs running kube-api server to actually start

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

@ -188,7 +188,7 @@ else
fi
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 ${EVENT_STORE_IP:-127.0.0.1}"
--command="chmod a+x configure-kubectl.sh && chmod a+x start-kubemark-master.sh && sudo ./start-kubemark-master.sh ${EVENT_STORE_IP:-127.0.0.1} ${NUM_NODES:-0}"
# create kubeconfig for Kubelet:
KUBECONFIG_CONTENTS=$(echo "apiVersion: v1