github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41737 from wojtek-t/tunable_kubemark_resources

Browse Source 
Automatic merge from submit-queue

More resources for hollowproxy in large kubemarks
This commit is contained in:
Kubernetes Submit Queue 2017-02-20 02:41:12 -08:00 committed by GitHub
commit 777de1952f
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/kubemark/resources/hollow-node_template.json
View File

@ -144,8 +144,8 @@
], ],
"resources": { "resources": {
"requests": { "requests": {
"cpu": "20m", "cpu": "{{HOLLOW_PROXY_CPU}}m",
"memory": "100M" "memory": "{{HOLLOW_PROXY_MEM}}Ki"
} }
} }
}, },

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

@ -309,6 +309,14 @@ current-context: kubemark-context")
# Create the replication controller for hollow-nodes. # Create the replication controller for hollow-nodes.
sed "s/{{numreplicas}}/${NUM_NODES:-10}/g" "${RESOURCE_DIRECTORY}/hollow-node_template.json" > "${RESOURCE_DIRECTORY}/hollow-node.json" sed "s/{{numreplicas}}/${NUM_NODES:-10}/g" "${RESOURCE_DIRECTORY}/hollow-node_template.json" > "${RESOURCE_DIRECTORY}/hollow-node.json"
proxy_cpu=20
if [ "${NUM_NODES:-10}" -gt 1000 ]; then
proxy_cpu=40
fi
proxy_mem_per_node=100
proxy_mem=$((100 * 1024 + ${proxy_mem_per_node}*${NUM_NODES:-10}))
sed -i'' -e "s/{{HOLLOW_PROXY_CPU}}/${proxy_cpu}/g" "${RESOURCE_DIRECTORY}/hollow-node.json"
sed -i'' -e "s/{{HOLLOW_PROXY_MEM}}/${proxy_mem}/g" "${RESOURCE_DIRECTORY}/hollow-node.json"
sed -i'' -e "s/{{registry}}/${CONTAINER_REGISTRY}/g" "${RESOURCE_DIRECTORY}/hollow-node.json" sed -i'' -e "s/{{registry}}/${CONTAINER_REGISTRY}/g" "${RESOURCE_DIRECTORY}/hollow-node.json"
sed -i'' -e "s/{{project}}/${PROJECT}/g" "${RESOURCE_DIRECTORY}/hollow-node.json" sed -i'' -e "s/{{project}}/${PROJECT}/g" "${RESOURCE_DIRECTORY}/hollow-node.json"
sed -i'' -e "s/{{master_ip}}/${MASTER_IP}/g" "${RESOURCE_DIRECTORY}/hollow-node.json" sed -i'' -e "s/{{master_ip}}/${MASTER_IP}/g" "${RESOURCE_DIRECTORY}/hollow-node.json"