Merge pull request #18216 from gmarek/limits

cluster/addons/cluster-monitoring/google/heapster-controller.yaml

@@ -28,9 +28,13 @@ spec:
         - image: gcr.io/google_containers/heapster:v0.18.2
           name: heapster
           resources:
+            # keep request = limit to keep this container in guaranteed class
             limits:
               cpu: 100m
               memory: {{ heapster_memory }}
+            requests:
+              cpu: 100m
+              memory: {{ heapster_memory }}
           command:
             - /heapster
             - --source=kubernetes:''

cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml

@@ -28,9 +28,13 @@ spec:
         - image: gcr.io/google_containers/heapster:v0.18.2
           name: heapster
           resources:
+            # keep request = limit to keep this container in guaranteed class
             limits:
               cpu: 100m
               memory: {{ heapster_memory }}
+            requests:
+              cpu: 100m
+              memory: {{ heapster_memory }}
           command:
             - /heapster
             - --source=kubernetes:''

cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml

@@ -28,9 +28,13 @@ spec:
         - image: gcr.io/google_containers/heapster:v0.18.2
           name: heapster
           resources:
+            # keep request = limit to keep this container in guaranteed class
             limits:
               cpu: 100m
               memory: {{ heapster_memory }}
+            requests:
+              cpu: 100m
+              memory: {{ heapster_memory }}
           command:
             - /heapster
             - --source=kubernetes:''

cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml

@@ -23,9 +23,13 @@ spec:
         - image: gcr.io/google_containers/heapster_influxdb:v0.4
           name: influxdb
           resources:
+            # keep request = limit to keep this container in guaranteed class
             limits:
               cpu: 100m
               memory: 200Mi
+            requests:
+              cpu: 100m
+              memory: 200Mi
           ports: 
             - containerPort: 8083
               hostPort: 8083
@@ -38,9 +42,13 @@ spec:
           name: grafana
           env:
           resources:
+            # keep request = limit to keep this container in guaranteed class
             limits:
               cpu: 100m
               memory: 100Mi
+            requests:
+              cpu: 100m
+              memory: 100Mi
           env:
             # This variable is required to setup templates in Grafana.
             - name: INFLUXDB_SERVICE_URL

cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml

@@ -28,9 +28,13 @@ spec:
         - image: gcr.io/google_containers/heapster:v0.18.2
           name: heapster
           resources:
+            # keep request = limit to keep this container in guaranteed class
             limits:
               cpu: 100m
               memory: {{ heapster_memory }}
+            requests:
+              cpu: 100m
+              memory: {{ heapster_memory }}
           command:
             - /heapster
             - --source=kubernetes:''

cluster/addons/dns/skydns-rc.yaml.in

@@ -23,9 +23,13 @@ spec:
       - name: etcd
         image: gcr.io/google_containers/etcd:2.0.9
         resources:
+          # keep request = limit to keep this container in guaranteed class
           limits:
             cpu: 100m
             memory: 50Mi
+          requests:
+            cpu: 100m
+            memory: 50Mi
         command:
         - /usr/local/bin/etcd
         - -data-dir
@@ -42,18 +46,26 @@ spec:
       - name: kube2sky
         image: gcr.io/google_containers/kube2sky:1.12
         resources:
+          # keep request = limit to keep this container in guaranteed class
           limits:
             cpu: 100m
             memory: 50Mi
+          requests:
+            cpu: 100m
+            memory: 50Mi
         args:
         # command = "/kube2sky"
         - -domain={{ pillar['dns_domain'] }}
       - name: skydns
         image: gcr.io/google_containers/skydns:2015-10-13-8c72f8c
         resources:
+          # keep request = limit to keep this container in guaranteed class
           limits:
             cpu: 100m
             memory: 50Mi
+          requests:
+            cpu: 100m
+            memory: 50Mi
         args:
         # command = "/skydns"
         - -machines=http://127.0.0.1:4001
@@ -84,9 +96,13 @@ spec:
       - name: healthz
         image: gcr.io/google_containers/exechealthz:1.0
         resources:
+          # keep request = limit to keep this container in guaranteed class
           limits:
             cpu: 10m
             memory: 20Mi
+          requests:
+            cpu: 10m
+            memory: 20Mi
         args:
         - -cmd=nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} 127.0.0.1 >/dev/null
         - -port=8080

cluster/addons/fluentd-elasticsearch/es-controller.yaml

@@ -23,8 +23,11 @@ spec:
       - image: gcr.io/google_containers/elasticsearch:1.8
         name: elasticsearch-logging         
         resources:
+          # keep request = limit to keep this container in guaranteed class
           limits:
             cpu: 100m
+          requests:
+            cpu: 100m
         ports:
         - containerPort: 9200
           name: db

cluster/addons/fluentd-elasticsearch/kibana-controller.yaml

@@ -23,8 +23,11 @@ spec:
       - name: kibana-logging
         image: gcr.io/google_containers/kibana:1.3
         resources:
+          # keep request = limit to keep this container in guaranteed class
           limits:
             cpu: 100m
+          requests:
+            cpu: 100m
         env:
           - name: "ELASTICSEARCH_URL"
             value: "http://elasticsearch-logging:9200"

cluster/addons/kube-ui/kube-ui-rc.yaml

@@ -23,9 +23,13 @@ spec:
       - name: kube-ui
         image: gcr.io/google_containers/kube-ui:v4
         resources:
+          # keep request = limit to keep this container in guaranteed class
           limits:
             cpu: 100m
             memory: 50Mi
+          requests:
+            cpu: 100m
+            memory: 50Mi
         ports:
         - containerPort: 8080
         livenessProbe:

cluster/addons/registry/registry-rc.yaml

@@ -23,9 +23,13 @@ spec:
       - name: registry
         image: registry:2
         resources:
+          # keep request = limit to keep this container in guaranteed class
           limits:
             cpu: 100m
             memory: 100Mi
+          requests:
+            cpu: 100m
+            memory: 100Mi
         env:
         - name: REGISTRY_HTTP_ADDR
           value: :5000