Merge pull request #22367 from a-robinson/requests

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-05 06:18:14 -08:00
commit 886c943379
2 changed files with 5 additions and 0 deletions

View File

@ -11,7 +11,10 @@ spec:
image: gcr.io/google_containers/fluentd-elasticsearch:1.15
resources:
limits:
memory: 200Mi
requests:
cpu: 100m
memory: 200Mi
volumeMounts:
- name: varlog
mountPath: /var/log

View File

@ -12,6 +12,8 @@ spec:
image: gcr.io/google_containers/fluentd-gcp:1.17
resources:
limits:
memory: 200Mi
requests:
cpu: 100m
memory: 200Mi
env: