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.

Sign up for GitHub

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

Jump to bottom

Make master component pods burstable, instead of guaranteed. #21194

Merged
merged 3 commits into from
Feb 13, 2016
Merged

Make master component pods burstable, instead of guaranteed. #21194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5493390
Make master component pods burstable, instead of guaranteed.
dchen1107 Feb 12, 2016
11a6d7d
Make coreos's master component manifest consistent with debian ones.
dchen1107 Feb 12, 2016
64ca54c
Make master component's manifest consistent with the ones on debian
dchen1107 Feb 12, 2016
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
2 changes: 0 additions & 2 deletions cluster/gce/coreos/kube-manifests/etcd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ spec:
name: clientport
protocol: TCP
resources:
limits:
cpu: 200m
requests:
cpu: 200m
volumeMounts:
Expand Down
2 changes: 0 additions & 2 deletions cluster/gce/coreos/kube-manifests/kube-apiserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ spec:
name: local
protocol: TCP
resources:
limits:
cpu: 250m
requests:
cpu: 250m
volumeMounts:
Expand Down
2 changes: 0 additions & 2 deletions cluster/gce/coreos/kube-manifests/kube-scheduler.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ spec:
timeoutSeconds: 15
name: kube-scheduler
resources:
limits:
cpu: 100m
requests:
cpu: 100m
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/trusty/kube-manifests/kube-apiserver.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"name": "kube-apiserver",
"image": "{{kube_docker_registry}}/kube-apiserver:{{kube-apiserver_docker_tag}}",
"resources": {
"limits": {
"requests": {
"cpu": "250m"
}
},
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/trusty/kube-manifests/kube-controller-manager.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"name": "kube-controller-manager",
"image": "{{kube_docker_registry}}/kube-controller-manager:{{kube-controller-manager_docker_tag}}",
"resources": {
"limits": {
"requests": {
"cpu": "200m"
}
},
Expand Down
2 changes: 1 addition & 1 deletion cluster/saltbase/salt/etcd/etcd.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"name": "etcd-container",
"image": "gcr.io/google_containers/etcd:2.2.1",
"resources": {
"limits": {
"requests": {
"cpu": {{ cpulimit }}
}
},
Expand Down
2 changes: 1 addition & 1 deletion cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
"name": "kube-apiserver",
"image": "{{pillar['kube_docker_registry']}}/kube-apiserver:{{pillar['kube-apiserver_docker_tag']}}",
"resources": {
"limits": {
"requests": {
"cpu": "250m"
}
},
Expand Down
2 changes: 1 addition & 1 deletion cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"name": "kube-controller-manager",
"image": "{{pillar['kube_docker_registry']}}/kube-controller-manager:{{pillar['kube-controller-manager_docker_tag']}}",
"resources": {
"limits": {
"requests": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What was the original reason for setting limits? Looks like we are not setting memory limits though.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We default request from limit if limit is provided but request is not. By changing this to limit, we maintian the behavior we had before enabling cpu-cfs-quota. As for why it was set to limits in the first place, I doubt that there was ever an intention to hardcap these.

"cpu": "200m"
}
},
Expand Down
2 changes: 1 addition & 1 deletion cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"name": "kube-scheduler",
"image": "{{pillar['kube_docker_registry']}}/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}",
"resources": {
"limits": {
"requests": {
"cpu": "100m"
}
},
Expand Down