diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-29 22:00:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 22:00:24 -0400 |
| commit | 6598350bc87d74a0b330cfdffc3ef956d96c7987 (patch) | |
| tree | dc308d2d316afa9bccc78216163a8279c88f2723 /roles | |
| parent | 69d5020bc2bdb019cc9a3574310f8ceb14b999ae (diff) | |
| parent | ace1f0b63bd0347990ffc3db806f23972f13560c (diff) | |
| download | openshift-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')
5 files changed, 1 insertions, 11 deletions
diff --git a/roles/openshift_logging_curator/templates/curator.j2 b/roles/openshift_logging_curator/templates/curator.j2 index e74918a40..6431f86d9 100644 --- a/roles/openshift_logging_curator/templates/curator.j2 +++ b/roles/openshift_logging_curator/templates/curator.j2 @@ -44,8 +44,6 @@ 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 5f2932541..cbe6b89f2 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: "{{es_memory_limit}}" + memory: "512Mi" ports: - containerPort: 9200 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 diff --git a/roles/openshift_logging_kibana/templates/kibana.j2 b/roles/openshift_logging_kibana/templates/kibana.j2 index da1386d3e..512d99d06 100644 --- a/roles/openshift_logging_kibana/templates/kibana.j2 +++ b/roles/openshift_logging_kibana/templates/kibana.j2 @@ -46,8 +46,6 @@ 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: @@ -84,8 +82,6 @@ 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 ff18d3270..70afe5cee 100644 --- a/roles/openshift_logging_mux/templates/mux.j2 +++ b/roles/openshift_logging_mux/templates/mux.j2 @@ -45,8 +45,6 @@ spec: {% endif %} {% if mux_memory_limit is not none %} memory: "{{mux_memory_limit}}" - requests: - memory: "{{mux_memory_limit}}" {% endif %} {% endif %} ports: |