From aaedbb52d363ebffc6df1220bea4ee6576b07088 Mon Sep 17 00:00:00 2001 From: Marian Lobur Date: Thu, 16 Aug 2018 15:06:13 +0200 Subject: [PATCH] Decrease CPU requests of master components in two times. --- cluster/gce/gci/configure-helper.sh | 6 +++--- cluster/gce/manifests/cluster-autoscaler.manifest | 2 +- cluster/gce/manifests/e2e-image-puller.manifest | 8 ++++---- cluster/gce/manifests/glbc.manifest | 2 +- cluster/gce/manifests/kube-addon-manager.yaml | 2 +- cluster/gce/manifests/kube-apiserver.manifest | 2 +- cluster/gce/manifests/kube-controller-manager.manifest | 2 +- cluster/gce/manifests/kube-scheduler.manifest | 2 +- cluster/gce/manifests/rescheduler.manifest | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 1330b3edfdd..7fbb51fbf1f 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -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 @@ -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 diff --git a/cluster/gce/manifests/cluster-autoscaler.manifest b/cluster/gce/manifests/cluster-autoscaler.manifest index d6a51447534..8e24ddbe010 100644 --- a/cluster/gce/manifests/cluster-autoscaler.manifest +++ b/cluster/gce/manifests/cluster-autoscaler.manifest @@ -44,7 +44,7 @@ ], "resources": { "requests": { - "cpu": "10m", + "cpu": "5m", "memory": "300Mi" } }, diff --git a/cluster/gce/manifests/e2e-image-puller.manifest b/cluster/gce/manifests/e2e-image-puller.manifest index 6d3ba6fb898..cf2c8f28255 100644 --- a/cluster/gce/manifests/e2e-image-puller.manifest +++ b/cluster/gce/manifests/e2e-image-puller.manifest @@ -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 @@ -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 diff --git a/cluster/gce/manifests/glbc.manifest b/cluster/gce/manifests/glbc.manifest index 15fc6cf99cb..1b2a944a46b 100644 --- a/cluster/gce/manifests/glbc.manifest +++ b/cluster/gce/manifests/glbc.manifest @@ -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 diff --git a/cluster/gce/manifests/kube-addon-manager.yaml b/cluster/gce/manifests/kube-addon-manager.yaml index 48a3b151939..2833fc8858d 100644 --- a/cluster/gce/manifests/kube-addon-manager.yaml +++ b/cluster/gce/manifests/kube-addon-manager.yaml @@ -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/ diff --git a/cluster/gce/manifests/kube-apiserver.manifest b/cluster/gce/manifests/kube-apiserver.manifest index 0a87bf5f5a5..7bb5214acd9 100644 --- a/cluster/gce/manifests/kube-apiserver.manifest +++ b/cluster/gce/manifests/kube-apiserver.manifest @@ -22,7 +22,7 @@ "image": "{{pillar['kube_docker_registry']}}/kube-apiserver:{{pillar['kube-apiserver_docker_tag']}}", "resources": { "requests": { - "cpu": "250m" + "cpu": "125m" } }, "command": [ diff --git a/cluster/gce/manifests/kube-controller-manager.manifest b/cluster/gce/manifests/kube-controller-manager.manifest index 124182bb09e..1ac0cdf3f23 100644 --- a/cluster/gce/manifests/kube-controller-manager.manifest +++ b/cluster/gce/manifests/kube-controller-manager.manifest @@ -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": [ diff --git a/cluster/gce/manifests/kube-scheduler.manifest b/cluster/gce/manifests/kube-scheduler.manifest index a3970bc1619..3b36b365c88 100644 --- a/cluster/gce/manifests/kube-scheduler.manifest +++ b/cluster/gce/manifests/kube-scheduler.manifest @@ -21,7 +21,7 @@ "image": "{{pillar['kube_docker_registry']}}/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}", "resources": { "requests": { - "cpu": "75m" + "cpu": "40m" } }, "command": [ diff --git a/cluster/gce/manifests/rescheduler.manifest b/cluster/gce/manifests/rescheduler.manifest index 6bbd4fa882a..9ab92315fa9 100644 --- a/cluster/gce/manifests/rescheduler.manifest +++ b/cluster/gce/manifests/rescheduler.manifest @@ -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