From 86928dbea07575087dd992ea3810851a1e4b45c4 Mon Sep 17 00:00:00 2001 From: Fabio Yeon Date: Fri, 24 Jun 2016 10:41:49 -0700 Subject: [PATCH] Increase pod CPU/memory for fluentd, dns and kube-proxy. --- cluster/gce/gci/configure-helper.sh | 4 ++-- cluster/gce/trusty/node.yaml | 2 +- cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml | 2 +- cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base | 2 +- cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in | 2 +- cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed | 2 +- cluster/saltbase/salt/kube-proxy/init.sls | 6 ++---- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 044aadf949e..83b6957574e 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -326,7 +326,7 @@ function assemble-docker-flags { echo "DOCKER_OPTS=\"${docker_opts} ${EXTRA_DOCKER_OPTS:-}\"" > /etc/default/docker # 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 echo "Docker command line is updated. Restart docker to pick it up" 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-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@{{ 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@{{api_servers_with_port}}@${api_servers}@g" ${src_file} if [[ -n "${CLUSTER_IP_RANGE:-}" ]]; then diff --git a/cluster/gce/trusty/node.yaml b/cluster/gce/trusty/node.yaml index 6437479011d..17cdcfe88b2 100644 --- a/cluster/gce/trusty/node.yaml +++ b/cluster/gce/trusty/node.yaml @@ -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-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 }}@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@{{api_servers_with_port}}@${api_servers}@g" ${tmp_file} if [ -n "${CLUSTER_IP_RANGE:-}" ]; then diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml index 10e678fae2b..15226d5d6bf 100644 --- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml +++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml @@ -18,7 +18,7 @@ spec: requests: # 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 + cpu: 100m memory: 200Mi env: - name: FLUENTD_ARGS diff --git a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base index 59b9debc189..1eaec013f20 100644 --- a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base +++ b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base @@ -52,7 +52,7 @@ spec: memory: 200Mi requests: cpu: 100m - memory: 50Mi + memory: 100Mi livenessProbe: httpGet: path: /healthz diff --git a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in index 5411979b94d..5d9cb596694 100644 --- a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in +++ b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in @@ -52,7 +52,7 @@ spec: memory: 200Mi requests: cpu: 100m - memory: 50Mi + memory: 100Mi livenessProbe: httpGet: path: /healthz diff --git a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed index 385d448d8e0..960a6c5e3d5 100644 --- a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed +++ b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed @@ -52,7 +52,7 @@ spec: memory: 200Mi requests: cpu: 100m - memory: 50Mi + memory: 100Mi livenessProbe: httpGet: path: /healthz diff --git a/cluster/saltbase/salt/kube-proxy/init.sls b/cluster/saltbase/salt/kube-proxy/init.sls index 2568a551502..6d65c574c45 100644 --- a/cluster/saltbase/salt/kube-proxy/init.sls +++ b/cluster/saltbase/salt/kube-proxy/init.sls @@ -17,12 +17,10 @@ - makedirs: true - dir_mode: 755 - context: - # 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. + # Increasing to 100m to avoid CPU starvation on full nodes. # Any change here should be accompanied by a proportional change in CPU # requests of other per-node add-ons (e.g. fluentd). - cpurequest: '20m' + cpurequest: '100m' - require: - service: docker - service: kubelet