summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_fluentd
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-08-29 16:47:55 -0400
committerGitHub <noreply@github.com>2017-08-29 16:47:55 -0400
commit69d5020bc2bdb019cc9a3574310f8ceb14b999ae (patch)
tree6329684808a12a57d3c5a93da15c9acdd547207c /roles/openshift_logging_fluentd
parentbe513254b49822c18509debbd944437d1f93b162 (diff)
parentf03e4edbb449848e9519c57be463c220f9870799 (diff)
downloadopenshift-69d5020bc2bdb019cc9a3574310f8ceb14b999ae.tar.gz
openshift-69d5020bc2bdb019cc9a3574310f8ceb14b999ae.tar.bz2
openshift-69d5020bc2bdb019cc9a3574310f8ceb14b999ae.tar.xz
openshift-69d5020bc2bdb019cc9a3574310f8ceb14b999ae.zip
Merge pull request #5119 from jcantrill/logging_memory_same_as_limit
logging set memory request to limit
Diffstat (limited to 'roles/openshift_logging_fluentd')
-rw-r--r--roles/openshift_logging_fluentd/templates/fluentd.j22
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