Merge pull request #21194 from dchen1107/test1

cluster/gce/coreos/kube-manifests/etcd.yaml

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

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:

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:

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"
       }
     },

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"
       }
     },

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 }}
       }
     },

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"
       }
     },

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"
       }
     },

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"
       }
     },