From f03e4edbb449848e9519c57be463c220f9870799 Mon Sep 17 00:00:00 2001
From: Jeff Cantrill <jcantril@redhat.com>
Date: Thu, 17 Aug 2017 12:18:57 -0400
Subject: logging set memory request to limit

---
 roles/openshift_logging_curator/templates/curator.j2  | 2 ++
 roles/openshift_logging_elasticsearch/templates/es.j2 | 2 +-
 roles/openshift_logging_fluentd/templates/fluentd.j2  | 2 ++
 roles/openshift_logging_kibana/templates/kibana.j2    | 4 ++++
 roles/openshift_logging_mux/templates/mux.j2          | 2 ++
 5 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'roles')

diff --git a/roles/openshift_logging_curator/templates/curator.j2 b/roles/openshift_logging_curator/templates/curator.j2
index 6431f86d9..e74918a40 100644
--- a/roles/openshift_logging_curator/templates/curator.j2
+++ b/roles/openshift_logging_curator/templates/curator.j2
@@ -44,6 +44,8 @@ spec:
               cpu: "{{curator_cpu_limit}}"
 {% if curator_memory_limit is defined and curator_memory_limit is not none and curator_memory_limit != "" %}
               memory: "{{curator_memory_limit}}"
+            requests:
+              memory: "{{curator_memory_limit}}"
 {% endif %}
           env:
             -
diff --git a/roles/openshift_logging_elasticsearch/templates/es.j2 b/roles/openshift_logging_elasticsearch/templates/es.j2
index cbe6b89f2..5f2932541 100644
--- a/roles/openshift_logging_elasticsearch/templates/es.j2
+++ b/roles/openshift_logging_elasticsearch/templates/es.j2
@@ -48,7 +48,7 @@ spec:
               cpu: "{{es_cpu_limit}}"
 {% endif %}
             requests:
-              memory: "512Mi"
+              memory: "{{es_memory_limit}}"
           ports:
             -
               containerPort: 9200
diff --git a/roles/openshift_logging_fluentd/templates/fluentd.j2 b/roles/openshift_logging_fluentd/templates/fluentd.j2
index 39dffba19..d637801e2 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
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:
diff --git a/roles/openshift_logging_mux/templates/mux.j2 b/roles/openshift_logging_mux/templates/mux.j2
index 70afe5cee..ff18d3270 100644
--- a/roles/openshift_logging_mux/templates/mux.j2
+++ b/roles/openshift_logging_mux/templates/mux.j2
@@ -45,6 +45,8 @@ spec:
 {% endif %}
 {% if mux_memory_limit is not none %}
             memory: "{{mux_memory_limit}}"
+          requests:
+            memory: "{{mux_memory_limit}}"
 {% endif %}
 {% endif %}
         ports:
-- 
cgit v1.2.1