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

Decrease CPU requests of master components in two times. #67504

Merged
merged 1 commit into from
Aug 17, 2018
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
6 changes: 3 additions & 3 deletions cluster/gce/gci/configure-helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1269,7 +1269,7 @@ function prepare-kube-proxy-manifest-variables {
sed -i -e "s@{{container_env}}@${container_env}@g" ${src_file}
sed -i -e "s@{{kube_cache_mutation_detector_env_name}}@${kube_cache_mutation_detector_env_name}@g" ${src_file}
sed -i -e "s@{{kube_cache_mutation_detector_env_value}}@${kube_cache_mutation_detector_env_value}@g" ${src_file}
sed -i -e "s@{{ cpurequest }}@100m@g" ${src_file}
sed -i -e "s@{{ cpurequest }}@50m@g" ${src_file}
sed -i -e "s@{{api_servers_with_port}}@${api_servers}@g" ${src_file}
sed -i -e "s@{{kubernetes_service_host_env_value}}@${KUBERNETES_MASTER_NAME}@g" ${src_file}
if [[ -n "${CLUSTER_IP_RANGE:-}" ]]; then
Expand Down Expand Up @@ -1390,10 +1390,10 @@ function start-etcd-servers {
rm -f /etc/init.d/etcd
fi
prepare-log-file /var/log/etcd.log
prepare-etcd-manifest "" "2379" "2380" "200m" "etcd.manifest"
prepare-etcd-manifest "" "2379" "2380" "100m" "etcd.manifest"

prepare-log-file /var/log/etcd-events.log
prepare-etcd-manifest "-events" "4002" "2381" "100m" "etcd-events.manifest"
prepare-etcd-manifest "-events" "4002" "2381" "50m" "etcd-events.manifest"
}

# Calculates the following variables based on env variables, which will be used
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/manifests/cluster-autoscaler.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
],
"resources": {
"requests": {
"cpu": "10m",
"cpu": "5m",
"memory": "300Mi"
}
},
Expand Down
8 changes: 4 additions & 4 deletions cluster/gce/manifests/e2e-image-puller.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ spec:
- name: image-puller
resources:
requests:
cpu: 100m
cpu: 50m
limits:
cpu: 100m
cpu: 50m
image: k8s.gcr.io/busybox:1.24
# TODO: Replace this with a go script that pulls in parallel?
# Currently it takes ~5m to pull all e2e images, so this is OK, and
Expand Down Expand Up @@ -90,9 +90,9 @@ spec:
- name: nethealth-check
resources:
requests:
cpu: 100m
cpu: 50m
limits:
cpu: 100m
cpu: 50m
image: k8s.gcr.io/kube-nethealth-amd64:1.0
command:
- /bin/sh
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/manifests/glbc.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
# master components on a single core master.
# TODO: Make resource requirements depend on the size of the cluster
requests:
cpu: 10m
cpu: 5m
memory: 50Mi
command:
# TODO: split this out into args when we no longer need to pipe stdout to a file #6428
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/manifests/kube-addon-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
- exec /opt/kube-addons.sh 1>>/var/log/kube-addon-manager.log 2>&1
resources:
requests:
cpu: 5m
cpu: 3m
memory: 50Mi
volumeMounts:
- mountPath: /etc/kubernetes/
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/manifests/kube-apiserver.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"image": "{{pillar['kube_docker_registry']}}/kube-apiserver:{{pillar['kube-apiserver_docker_tag']}}",
"resources": {
"requests": {
"cpu": "250m"
"cpu": "125m"
}
},
"command": [
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/manifests/kube-controller-manager.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"image": "{{pillar['kube_docker_registry']}}/kube-controller-manager:{{pillar['kube-controller-manager_docker_tag']}}",
"resources": {
"requests": {
"cpu": "200m"
"cpu": "100m"
}
},
"command": [
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/manifests/kube-scheduler.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"image": "{{pillar['kube_docker_registry']}}/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}",
"resources": {
"requests": {
"cpu": "75m"
"cpu": "40m"
}
},
"command": [
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/manifests/rescheduler.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
# TODO: Make resource requirements depend on the size of the cluster
resources:
requests:
cpu: 10m
cpu: 5m
memory: 100Mi
command:
# TODO: split this out into args when we no longer need to pipe stdout to a file #6428
Expand Down