Merge pull request #68615 from loburm/revert_cpu_decrease

Revert "#67504: Decrease CPU requests of master components in two times."
This commit is contained in:
k8s-ci-robot
2018-09-20 12:31:17 -07:00
committed by GitHub
7 changed files with 9 additions and 9 deletions

View File

@@ -44,7 +44,7 @@
],
"resources": {
"requests": {
"cpu": "5m",
"cpu": "10m",
"memory": "300Mi"
}
},

View File

@@ -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: 5m
cpu: 10m
memory: 50Mi
command:
# TODO: split this out into args when we no longer need to pipe stdout to a file #6428

View File

@@ -21,7 +21,7 @@ spec:
- exec /opt/kube-addons.sh 1>>/var/log/kube-addon-manager.log 2>&1
resources:
requests:
cpu: 3m
cpu: 5m
memory: 50Mi
volumeMounts:
- mountPath: /etc/kubernetes/

View File

@@ -22,7 +22,7 @@
"image": "{{pillar['kube_docker_registry']}}/kube-apiserver:{{pillar['kube-apiserver_docker_tag']}}",
"resources": {
"requests": {
"cpu": "125m"
"cpu": "250m"
}
},
"command": [

View File

@@ -21,7 +21,7 @@
"image": "{{pillar['kube_docker_registry']}}/kube-controller-manager:{{pillar['kube-controller-manager_docker_tag']}}",
"resources": {
"requests": {
"cpu": "100m"
"cpu": "200m"
}
},
"command": [

View File

@@ -21,7 +21,7 @@
"image": "{{pillar['kube_docker_registry']}}/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}",
"resources": {
"requests": {
"cpu": "40m"
"cpu": "75m"
}
},
"command": [