diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-29 16:47:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 16:47:55 -0400 |
| commit | 69d5020bc2bdb019cc9a3574310f8ceb14b999ae (patch) | |
| tree | 6329684808a12a57d3c5a93da15c9acdd547207c /roles/openshift_logging_kibana | |
| parent | be513254b49822c18509debbd944437d1f93b162 (diff) | |
| parent | f03e4edbb449848e9519c57be463c220f9870799 (diff) | |
| download | openshift-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_kibana')
| -rw-r--r-- | roles/openshift_logging_kibana/templates/kibana.j2 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_logging_kibana/templates/kibana.j2 b/roles/openshift_logging_kibana/templates/kibana.j2 index 512d99d06..da1386d3e 100644 --- a/roles/openshift_logging_kibana/templates/kibana.j2 +++ b/roles/openshift_logging_kibana/templates/kibana.j2 @@ -46,6 +46,8 @@ spec: {% endif %} {% if kibana_memory_limit is not none and kibana_memory_limit != "" %} memory: "{{ kibana_memory_limit }}" + requests: + memory: "{{ kibana_memory_limit }}" {% endif %} {% endif %} env: @@ -82,6 +84,8 @@ spec: {% endif %} {% if kibana_proxy_memory_limit is not none and kibana_proxy_memory_limit != "" %} memory: "{{ kibana_proxy_memory_limit }}" + requests: + memory: "{{ kibana_proxy_memory_limit }}" {% endif %} {% endif %} ports: |