github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21194 from dchen1107/test1

Browse Source 
Make master component pods burstable, instead of guaranteed.
This commit is contained in:
Mike Danese 2016-02-12 17:08:27 -08:00
commit b8aa23f0fa
9 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/coreos/kube-manifests/etcd.yaml
View File

@ -35,8 +35,6 @@ spec:
name: clientport name: clientport
protocol: TCP protocol: TCP
resources: resources:
limits:
cpu: 200m
requests: requests:
cpu: 200m cpu: 200m
volumeMounts: volumeMounts:

2
cluster/gce/coreos/kube-manifests/kube-apiserver.yaml
View File

@ -45,8 +45,6 @@ spec:
name: local name: local
protocol: TCP protocol: TCP
resources: resources:
limits:
cpu: 250m
requests: requests:
cpu: 250m cpu: 250m
volumeMounts: volumeMounts:

2
cluster/gce/coreos/kube-manifests/kube-scheduler.yaml
View File

@ -24,8 +24,6 @@ spec:
timeoutSeconds: 15 timeoutSeconds: 15
name: kube-scheduler name: kube-scheduler
resources: resources:
limits:
cpu: 100m
requests: requests:
cpu: 100m cpu: 100m
volumeMounts: volumeMounts:

2
cluster/gce/trusty/kube-manifests/kube-apiserver.manifest
View File

@ -12,7 +12,7 @@
"name": "kube-apiserver", "name": "kube-apiserver",
"image": "{{kube_docker_registry}}/kube-apiserver:{{kube-apiserver_docker_tag}}", "image": "{{kube_docker_registry}}/kube-apiserver:{{kube-apiserver_docker_tag}}",
"resources": { "resources": {
"limits": { "requests": {
"cpu": "250m" "cpu": "250m"
} }
}, },

2
cluster/gce/trusty/kube-manifests/kube-controller-manager.manifest
View File

@ -12,7 +12,7 @@
"name": "kube-controller-manager", "name": "kube-controller-manager",
"image": "{{kube_docker_registry}}/kube-controller-manager:{{kube-controller-manager_docker_tag}}", "image": "{{kube_docker_registry}}/kube-controller-manager:{{kube-controller-manager_docker_tag}}",
"resources": { "resources": {
"limits": { "requests": {
"cpu": "200m" "cpu": "200m"
} }
}, },

2
cluster/saltbase/salt/etcd/etcd.manifest
View File

@ -12,7 +12,7 @@
"name": "etcd-container", "name": "etcd-container",
"image": "gcr.io/google_containers/etcd:2.2.1", "image": "gcr.io/google_containers/etcd:2.2.1",
"resources": { "resources": {
"limits": { "requests": {
"cpu": {{ cpulimit }} "cpu": {{ cpulimit }}
} }
}, },

2
cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
View File

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

2
cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
View File

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

2
cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest
View File

@ -26,7 +26,7 @@
"name": "kube-scheduler", "name": "kube-scheduler",
"image": "{{pillar['kube_docker_registry']}}/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}", "image": "{{pillar['kube_docker_registry']}}/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}",
"resources": { "resources": {
"limits": { "requests": {
"cpu": "100m" "cpu": "100m"
} }
}, },