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

Change kube-proxy & fluentd CPU request to 20m/80m.

Browse Source
This commit is contained in:
CJ Cullen 2016-03-30 14:21:01 -07:00
parent 2ac788b492
commit 26a6c66de5
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/trusty/node.yaml
View File

@ -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_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/{{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/{{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/{{log_level}}/${log_level}/g" ${tmp_file}
sed -i -e "s/{{api_servers_with_port}}/${api_servers}/g" ${tmp_file} sed -i -e "s/{{api_servers_with_port}}/${api_servers}/g" ${tmp_file}

4
cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
View File

@ -14,7 +14,9 @@ spec:
limits: limits:
memory: 200Mi memory: 200Mi
requests: 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 memory: 200Mi
env: env:
- name: FLUENTD_ARGS - name: FLUENTD_ARGS

7
cluster/saltbase/salt/kube-proxy/init.sls
View File

@ -17,7 +17,12 @@
- makedirs: true - makedirs: true
- dir_mode: 755 - dir_mode: 755
- context: - 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: - require:
- service: docker - service: docker
- service: kubelet - service: kubelet