Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jun 24, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions cluster/gce/gci/configure-helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/trusty/node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spec:
memory: 200Mi
requests:
cpu: 100m
memory: 50Mi
memory: 100Mi
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spec:
memory: 200Mi
requests:
cpu: 100m
memory: 50Mi
memory: 100Mi
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spec:
memory: 200Mi
requests:
cpu: 100m
memory: 50Mi
memory: 100Mi
livenessProbe:
httpGet:
path: /healthz
Expand Down
6 changes: 2 additions & 4 deletions cluster/saltbase/salt/kube-proxy/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down