github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 20:17:41 +00:00
Code Issues Projects Releases Wiki Activity

Increase pod CPU/memory for fluentd, dns and kube-proxy.

Browse Source
This commit is contained in:
Fabio Yeon 2016-06-24 10:41:49 -07:00
parent 178bcd1c11
commit 86928dbea0
7 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/gce/gci/configure-helper.sh
View File

@ -326,7 +326,7 @@ function assemble-docker-flags {
echo "DOCKER_OPTS=\"${docker_opts} ${EXTRA_DOCKER_OPTS:-}\"" > /etc/default/docker echo "DOCKER_OPTS=\"${docker_opts} ${EXTRA_DOCKER_OPTS:-}\"" > /etc/default/docker
# If using a network plugin, we need to explicitly restart docker daemon, because # If using a network plugin, we need to explicitly restart docker daemon, because
# kubelet will not do it. # kubelet will not do it.
if [[ "${use_net_plugin}" == "true" ]]; then if [[ "${use_net_plugin}" == "true" ]]; then
echo "Docker command line is updated. Restart docker to pick it up" echo "Docker command line is updated. Restart docker to pick it up"
systemctl restart docker systemctl restart docker
@ -474,7 +474,7 @@ function start-kube-proxy {
sed -i -e "s@{{pillar\['kube_docker_registry'\]}}@${kube_docker_registry}@g" ${src_file} sed -i -e "s@{{pillar\['kube_docker_registry'\]}}@${kube_docker_registry}@g" ${src_file}
sed -i -e "s@{{pillar\['kube-proxy_docker_tag'\]}}@${kube_proxy_docker_tag}@g" ${src_file} sed -i -e "s@{{pillar\['kube-proxy_docker_tag'\]}}@${kube_proxy_docker_tag}@g" ${src_file}
sed -i -e "s@{{test_args}}@${KUBEPROXY_TEST_ARGS:-}@g" ${src_file} sed -i -e "s@{{test_args}}@${KUBEPROXY_TEST_ARGS:-}@g" ${src_file}
sed -i -e "s@{{ cpurequest }}@20m@g" ${src_file} sed -i -e "s@{{ cpurequest }}@100m@g" ${src_file}
sed -i -e "s@{{log_level}}@${KUBEPROXY_TEST_LOG_LEVEL:-"--v=2"}@g" ${src_file} sed -i -e "s@{{log_level}}@${KUBEPROXY_TEST_LOG_LEVEL:-"--v=2"}@g" ${src_file}
sed -i -e "s@{{api_servers_with_port}}@${api_servers}@g" ${src_file} sed -i -e "s@{{api_servers_with_port}}@${api_servers}@g" ${src_file}
if [[ -n "${CLUSTER_IP_RANGE:-}" ]]; then if [[ -n "${CLUSTER_IP_RANGE:-}" ]]; then

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

@ -212,7 +212,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 }}@20m@g" ${tmp_file} sed -i -e "s@{{ cpurequest }}@100m@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}
if [ -n "${CLUSTER_IP_RANGE:-}" ]; then if [ -n "${CLUSTER_IP_RANGE:-}" ]; then

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

@ -18,7 +18,7 @@ spec:
requests: requests:
# Any change here should be accompanied by a proportional change in CPU # Any change here should be accompanied by a proportional change in CPU
# requests of other per-node add-ons (e.g. kube-proxy). # requests of other per-node add-ons (e.g. kube-proxy).
cpu: 80m cpu: 100m
memory: 200Mi memory: 200Mi
env: env:
- name: FLUENTD_ARGS - name: FLUENTD_ARGS

2
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base
View File

@ -52,7 +52,7 @@ spec:
memory: 200Mi memory: 200Mi
requests: requests:
cpu: 100m cpu: 100m
memory: 50Mi memory: 100Mi
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz

2
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in
View File

@ -52,7 +52,7 @@ spec:
memory: 200Mi memory: 200Mi
requests: requests:
cpu: 100m cpu: 100m
memory: 50Mi memory: 100Mi
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz

2
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed
View File

@ -52,7 +52,7 @@ spec:
memory: 200Mi memory: 200Mi
requests: requests:
cpu: 100m cpu: 100m
memory: 50Mi memory: 100Mi
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz

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

@ -17,12 +17,10 @@
- makedirs: true - makedirs: true
- dir_mode: 755 - dir_mode: 755
- context: - context:
# 20m might cause kube-proxy CPU starvation on full nodes, resulting in # Increasing to 100m to avoid CPU starvation on full nodes.
# 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 # Any change here should be accompanied by a proportional change in CPU
# requests of other per-node add-ons (e.g. fluentd). # requests of other per-node add-ons (e.g. fluentd).
cpurequest: '20m' cpurequest: '100m'
- require: - require:
- service: docker - service: docker
- service: kubelet - service: kubelet