Commit 2e89f555 authored by Alex Mohr's avatar Alex Mohr

Merge pull request #23646 from cjcullen/kubeproxy

Change kube-proxy & fluentd CPU request to 20m/80m.
parents 56de2d11 26a6c66d
......@@ -215,7 +215,7 @@ script
sed -i -e "s/{{pillar\['kube_docker_registry'\]}}/${kube_docker_registry}/g" ${tmp_file}
sed -i -e "s/{{pillar\['kube-proxy_docker_tag'\]}}/${kube_proxy_docker_tag}/g" ${tmp_file}
sed -i -e "s/{{test_args}}/${test_args}/g" ${tmp_file}
sed -i -e "s/{{ cpurequest }}/200m/g" ${tmp_file}
sed -i -e "s/{{ cpurequest }}/20m/g" ${tmp_file}
sed -i -e "s/{{log_level}}/${log_level}/g" ${tmp_file}
sed -i -e "s/{{api_servers_with_port}}/${api_servers}/g" ${tmp_file}
......
......@@ -14,7 +14,9 @@ spec:
limits:
memory: 200Mi
requests:
cpu: 100m
# Any change here should be accompanied by a proportional change in CPU
# requests of other per-node add-ons (e.g. kube-proxy).
cpu: 80m
memory: 200Mi
env:
- name: FLUENTD_ARGS
......
......@@ -17,7 +17,12 @@
- makedirs: true
- dir_mode: 755
- context:
cpurequest: '200m'
# 20m might cause kube-proxy CPU starvation on full nodes, resulting in
# delayed service updates. But, giving it more would be a breaking change
# to the overhead requirements for existing clusters.
# Any change here should be accompanied by a proportional change in CPU
# requests of other per-node add-ons (e.g. fluentd).
cpurequest: '20m'
- require:
- service: docker
- service: kubelet
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment