diff options
| author | Peter Portante <peter.portante@redhat.com> | 2017-10-13 11:04:49 -0400 |
|---|---|---|
| committer | Peter Portante <peter.portante@redhat.com> | 2017-10-19 11:02:14 -0400 |
| commit | 578ac5b348fa3e9c7d0d05e3a0f579839ecd79dd (patch) | |
| tree | 72796eb1a2f540e9c179ced0bf3d23649b43b11e /roles/openshift_logging_kibana/tasks/main.yaml | |
| parent | 70d7173aef356f834c1d4c7cd533170f13f9f665 (diff) | |
| download | openshift-578ac5b348fa3e9c7d0d05e3a0f579839ecd79dd.tar.gz openshift-578ac5b348fa3e9c7d0d05e3a0f579839ecd79dd.tar.bz2 openshift-578ac5b348fa3e9c7d0d05e3a0f579839ecd79dd.tar.xz openshift-578ac5b348fa3e9c7d0d05e3a0f579839ecd79dd.zip | |
Use "requests" for CPU resources instead of limits
We now use a CPU request to ensure logging infrastructure pods are
not capped by default for CPU usage. It is still important to ensure
we have a minimum amount of CPU.
We keep the use of the variables *_cpu_limit so that the existing
behavior is maintained.
Note that we don't want to cap an infra pod's CPU usage by default,
since we want to be able to use the necessary resources to complete
it's tasks.
Bug 1501960 (https://bugzilla.redhat.com/show_bug.cgi?id=1501960)
Diffstat (limited to 'roles/openshift_logging_kibana/tasks/main.yaml')
| -rw-r--r-- | roles/openshift_logging_kibana/tasks/main.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_logging_kibana/tasks/main.yaml b/roles/openshift_logging_kibana/tasks/main.yaml index e17e8c1f2..809f7a631 100644 --- a/roles/openshift_logging_kibana/tasks/main.yaml +++ b/roles/openshift_logging_kibana/tasks/main.yaml @@ -230,8 +230,10 @@ es_host: "{{ openshift_logging_kibana_es_host }}" es_port: "{{ openshift_logging_kibana_es_port }}" kibana_cpu_limit: "{{ openshift_logging_kibana_cpu_limit }}" + kibana_cpu_request: "{{ openshift_logging_kibana_cpu_request }}" kibana_memory_limit: "{{ openshift_logging_kibana_memory_limit }}" kibana_proxy_cpu_limit: "{{ openshift_logging_kibana_proxy_cpu_limit }}" + kibana_proxy_cpu_request: "{{ openshift_logging_kibana_proxy_cpu_request }}" kibana_proxy_memory_limit: "{{ openshift_logging_kibana_proxy_memory_limit }}" kibana_replicas: "{{ openshift_logging_kibana_replicas | default (1) }}" kibana_node_selector: "{{ openshift_logging_kibana_nodeselector | default({}) }}" |