Merge pull request kubernetes#21194 from dchen1107/test1

mikedanese · mikedanese · commit b8aa23f0fa69 · 2016-02-12T17:08:27.000-08:00
Make master component pods burstable, instead of guaranteed.
diff --git 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
@@ -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
@@ -24,8 +24,6 @@ spec:
       timeoutSeconds: 15
     name: kube-scheduler
     resources:
-      limits:
-        cpu: 100m
       requests:
         cpu: 100m
     volumeMounts:
diff --git 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
@@ -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"
       }
     },
diff --git 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
@@ -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
@@ -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
@@ -26,7 +26,7 @@
     "name": "kube-scheduler",
     "image": "{{pillar['kube_docker_registry']}}/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}",
     "resources": {
-      "limits": {
+      "requests": {
         "cpu": "100m"
       }
     },

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`"name": "kube-apiserver",`
`13`	`13`	`"image": "{{kube_docker_registry}}/kube-apiserver:{{kube-apiserver_docker_tag}}",`
`14`	`14`	`"resources": {`
`15`		`- "limits": {`
	`15`	`+ "requests": {`
`16`	`16`	`"cpu": "250m"`
`17`	`17`	`}`
`18`	`18`	`},`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@`
`117`	`117`	`"name": "kube-apiserver",`
`118`	`118`	`"image": "{{pillar['kube_docker_registry']}}/kube-apiserver:{{pillar['kube-apiserver_docker_tag']}}",`
`119`	`119`	`"resources": {`
`120`		`- "limits": {`
	`120`	`+ "requests": {`
`121`	`121`	`"cpu": "250m"`
`122`	`122`	`}`
`123`	`123`	`},`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@`
`74`	`74`	`"name": "kube-controller-manager",`
`75`	`75`	`"image": "{{pillar['kube_docker_registry']}}/kube-controller-manager:{{pillar['kube-controller-manager_docker_tag']}}",`
`76`	`76`	`"resources": {`
`77`		`- "limits": {`
	`77`	`+ "requests": {`
`78`	`78`	`"cpu": "200m"`
`79`	`79`	`}`
`80`	`80`	`},`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"name": "kube-scheduler",`
`27`	`27`	`"image": "{{pillar['kube_docker_registry']}}/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}",`
`28`	`28`	`"resources": {`
`29`		`- "limits": {`
	`29`	`+ "requests": {`
`30`	`30`	`"cpu": "100m"`
`31`	`31`	`}`
`32`	`32`	`},`