From 54933902b23cb9a5cc322c17f6c266a41470bb61 Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Fri, 12 Feb 2016 14:28:48 -0800 Subject: [PATCH 1/3] Make master component pods burstable, instead of guaranteed. --- cluster/saltbase/salt/etcd/etcd.manifest | 2 +- cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest | 2 +- .../kube-controller-manager/kube-controller-manager.manifest | 2 +- cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/saltbase/salt/etcd/etcd.manifest b/cluster/saltbase/salt/etcd/etcd.manifest index 33c04dab039..4bf4851a1b7 100644 --- a/cluster/saltbase/salt/etcd/etcd.manifest +++ b/cluster/saltbase/salt/etcd/etcd.manifest @@ -12,7 +12,7 @@ "name": "etcd-container", "image": "gcr.io/google_containers/etcd:2.2.1", "resources": { - "limits": { + "requests": { "cpu": {{ cpulimit }} } }, diff --git a/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest b/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest index 2120ff23887..0b385e29b3e 100644 --- a/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest +++ b/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest @@ -117,7 +117,7 @@ "name": "kube-apiserver", "image": "{{pillar['kube_docker_registry']}}/kube-apiserver:{{pillar['kube-apiserver_docker_tag']}}", "resources": { - "limits": { + "requests": { "cpu": "250m" } }, diff --git a/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest b/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest index 39444e91005..5777ef0ee30 100644 --- a/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest +++ b/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest @@ -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": { "cpu": "200m" } }, diff --git a/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest b/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest index 8da3d72c3ff..7ae312a3d6f 100644 --- a/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest +++ b/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest @@ -26,7 +26,7 @@ "name": "kube-scheduler", "image": "{{pillar['kube_docker_registry']}}/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}", "resources": { - "limits": { + "requests": { "cpu": "100m" } }, From 11a6d7df2668578b1daa05c75fbdc61ea345fadd Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Fri, 12 Feb 2016 14:55:28 -0800 Subject: [PATCH 2/3] Make coreos's master component manifest consistent with debian ones. --- cluster/gce/coreos/kube-manifests/etcd.yaml | 2 -- cluster/gce/coreos/kube-manifests/kube-apiserver.yaml | 2 -- cluster/gce/coreos/kube-manifests/kube-scheduler.yaml | 2 -- 3 files changed, 6 deletions(-) diff --git a/cluster/gce/coreos/kube-manifests/etcd.yaml b/cluster/gce/coreos/kube-manifests/etcd.yaml index 571c7db24cb..4e1ea97ea2b 100644 --- a/cluster/gce/coreos/kube-manifests/etcd.yaml +++ b/cluster/gce/coreos/kube-manifests/etcd.yaml @@ -35,8 +35,6 @@ spec: name: clientport protocol: TCP resources: - limits: - cpu: 200m requests: cpu: 200m volumeMounts: diff --git a/cluster/gce/coreos/kube-manifests/kube-apiserver.yaml b/cluster/gce/coreos/kube-manifests/kube-apiserver.yaml index 490e391844a..c77823b272b 100644 --- a/cluster/gce/coreos/kube-manifests/kube-apiserver.yaml +++ b/cluster/gce/coreos/kube-manifests/kube-apiserver.yaml @@ -45,8 +45,6 @@ spec: name: local protocol: TCP resources: - limits: - cpu: 250m requests: cpu: 250m volumeMounts: diff --git a/cluster/gce/coreos/kube-manifests/kube-scheduler.yaml b/cluster/gce/coreos/kube-manifests/kube-scheduler.yaml index 8ef9f5a73d0..62c3a650165 100644 --- a/cluster/gce/coreos/kube-manifests/kube-scheduler.yaml +++ b/cluster/gce/coreos/kube-manifests/kube-scheduler.yaml @@ -24,8 +24,6 @@ spec: timeoutSeconds: 15 name: kube-scheduler resources: - limits: - cpu: 100m requests: cpu: 100m volumeMounts: From 64ca54c2cc8d4a94482ec4f57a917fb435bb03a7 Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Fri, 12 Feb 2016 14:56:12 -0800 Subject: [PATCH 3/3] Make master component's manifest consistent with the ones on debian --- cluster/gce/trusty/kube-manifests/kube-apiserver.manifest | 2 +- .../gce/trusty/kube-manifests/kube-controller-manager.manifest | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/gce/trusty/kube-manifests/kube-apiserver.manifest b/cluster/gce/trusty/kube-manifests/kube-apiserver.manifest index fa37f1eacc3..b9cd229f725 100644 --- a/cluster/gce/trusty/kube-manifests/kube-apiserver.manifest +++ b/cluster/gce/trusty/kube-manifests/kube-apiserver.manifest @@ -12,7 +12,7 @@ "name": "kube-apiserver", "image": "{{kube_docker_registry}}/kube-apiserver:{{kube-apiserver_docker_tag}}", "resources": { - "limits": { + "requests": { "cpu": "250m" } }, diff --git a/cluster/gce/trusty/kube-manifests/kube-controller-manager.manifest b/cluster/gce/trusty/kube-manifests/kube-controller-manager.manifest index de91d59ff42..6ade1c15247 100644 --- a/cluster/gce/trusty/kube-manifests/kube-controller-manager.manifest +++ b/cluster/gce/trusty/kube-manifests/kube-controller-manager.manifest @@ -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" } },