diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-09-06 17:39:51 -0400 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 17:39:51 -0400 | 
| commit | e7320ee23086355aa45bcf4229008063d9bc5136 (patch) | |
| tree | 77d32a668c52a1b5c46c0c9742168ad3d9762ce0 /roles/openshift_logging_fluentd | |
| parent | bb7502b5c22a0af691c552c1c86a4d4b1fb6b0bc (diff) | |
| parent | f0a12fafd1320cd717eea896bb27cf222df6e9c3 (diff) | |
| download | openshift-e7320ee23086355aa45bcf4229008063d9bc5136.tar.gz openshift-e7320ee23086355aa45bcf4229008063d9bc5136.tar.bz2 openshift-e7320ee23086355aa45bcf4229008063d9bc5136.tar.xz openshift-e7320ee23086355aa45bcf4229008063d9bc5136.zip | |
Merge pull request #5276 from richm/master
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging_fluentd')
| -rw-r--r-- | roles/openshift_logging_fluentd/templates/fluentd.j2 | 2 | 
1 files changed, 2 insertions, 0 deletions
| diff --git a/roles/openshift_logging_fluentd/templates/fluentd.j2 b/roles/openshift_logging_fluentd/templates/fluentd.j2 index 88e039e3f..a4afb6618 100644 --- a/roles/openshift_logging_fluentd/templates/fluentd.j2 +++ b/roles/openshift_logging_fluentd/templates/fluentd.j2 @@ -36,6 +36,8 @@ spec:            limits:              cpu: {{ openshift_logging_fluentd_cpu_limit }}              memory: {{ openshift_logging_fluentd_memory_limit }} +          requests: +            memory: {{ openshift_logging_fluentd_memory_limit }}          volumeMounts:          - name: runlogjournal            mountPath: /run/log/journal | 
