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_mux/defaults/main.yml | |
| 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_mux/defaults/main.yml')
| -rw-r--r-- | roles/openshift_logging_mux/defaults/main.yml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/roles/openshift_logging_mux/defaults/main.yml b/roles/openshift_logging_mux/defaults/main.yml index 68412aec8..9de686576 100644 --- a/roles/openshift_logging_mux/defaults/main.yml +++ b/roles/openshift_logging_mux/defaults/main.yml @@ -9,10 +9,11 @@ openshift_logging_mux_namespace: logging ### Common settings openshift_logging_mux_nodeselector: "{{ openshift_hosted_logging_mux_nodeselector_label | default('') | map_from_pairs }}" -openshift_logging_mux_cpu_limit: 500m -openshift_logging_mux_memory_limit: 2Gi -openshift_logging_mux_buffer_queue_limit: 1024 -openshift_logging_mux_buffer_size_limit: 1m +openshift_logging_mux_cpu_limit: null +openshift_logging_mux_cpu_request: 100m +openshift_logging_mux_memory_limit: 512Mi +openshift_logging_mux_buffer_queue_limit: 32 +openshift_logging_mux_buffer_size_limit: 8m openshift_logging_mux_replicas: 1 @@ -57,11 +58,11 @@ openshift_logging_mux_file_buffer_storage_type: "emptydir" openshift_logging_mux_file_buffer_pvc_name: "logging-mux-pvc" # required if the PVC does not already exist -openshift_logging_mux_file_buffer_pvc_size: 4Gi +openshift_logging_mux_file_buffer_pvc_size: 1Gi openshift_logging_mux_file_buffer_pvc_dynamic: false openshift_logging_mux_file_buffer_pvc_pv_selector: {} openshift_logging_mux_file_buffer_pvc_access_modes: ['ReadWriteOnce'] openshift_logging_mux_file_buffer_storage_group: '65534' openshift_logging_mux_file_buffer_pvc_prefix: "logging-mux" -openshift_logging_mux_file_buffer_limit: 2Gi +openshift_logging_mux_file_buffer_limit: 256Mi |