summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_fluentd/templates/fluentd.j2
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-08-29 22:00:24 -0400
committerGitHub <noreply@github.com>2017-08-29 22:00:24 -0400
commit6598350bc87d74a0b330cfdffc3ef956d96c7987 (patch)
treedc308d2d316afa9bccc78216163a8279c88f2723 /roles/openshift_logging_fluentd/templates/fluentd.j2
parent69d5020bc2bdb019cc9a3574310f8ceb14b999ae (diff)
parentace1f0b63bd0347990ffc3db806f23972f13560c (diff)
downloadopenshift-6598350bc87d74a0b330cfdffc3ef956d96c7987.tar.gz
openshift-6598350bc87d74a0b330cfdffc3ef956d96c7987.tar.bz2
openshift-6598350bc87d74a0b330cfdffc3ef956d96c7987.tar.xz
openshift-6598350bc87d74a0b330cfdffc3ef956d96c7987.zip
Merge pull request #5262 from openshift/revert-5119-logging_memory_same_as_limit
Revert "logging set memory request to limit"
Diffstat (limited to 'roles/openshift_logging_fluentd/templates/fluentd.j2')
-rw-r--r--roles/openshift_logging_fluentd/templates/fluentd.j22
1 files changed, 0 insertions, 2 deletions
diff --git a/roles/openshift_logging_fluentd/templates/fluentd.j2 b/roles/openshift_logging_fluentd/templates/fluentd.j2
index a4afb6618..88e039e3f 100644
--- a/roles/openshift_logging_fluentd/templates/fluentd.j2
+++ b/roles/openshift_logging_fluentd/templates/fluentd.j2
@@ -36,8 +36,6 @@ 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