diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-20 16:57:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-20 16:57:58 -0400 |
| commit | ac2af73540c957aedd74e523646645cd36e8c130 (patch) | |
| tree | f6ebe672125033d50e329eb88bd46e7ae82b51c8 /roles/openshift_logging_fluentd/defaults/main.yml | |
| parent | e758bbe9739596f5e50b5a861198e5060d830d9b (diff) | |
| parent | 578ac5b348fa3e9c7d0d05e3a0f579839ecd79dd (diff) | |
| download | openshift-ac2af73540c957aedd74e523646645cd36e8c130.tar.gz openshift-ac2af73540c957aedd74e523646645cd36e8c130.tar.bz2 openshift-ac2af73540c957aedd74e523646645cd36e8c130.tar.xz openshift-ac2af73540c957aedd74e523646645cd36e8c130.zip | |
Merge pull request #5748 from portante/fix-cpu-limits
Use "requests" for CPU resources instead of limits
Diffstat (limited to 'roles/openshift_logging_fluentd/defaults/main.yml')
| -rw-r--r-- | roles/openshift_logging_fluentd/defaults/main.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/roles/openshift_logging_fluentd/defaults/main.yml b/roles/openshift_logging_fluentd/defaults/main.yml index 25f7580a4..861935c99 100644 --- a/roles/openshift_logging_fluentd/defaults/main.yml +++ b/roles/openshift_logging_fluentd/defaults/main.yml @@ -8,7 +8,8 @@ openshift_logging_fluentd_namespace: logging ### Common settings openshift_logging_fluentd_nodeselector: "{{ openshift_hosted_logging_fluentd_nodeselector_label | default('logging-infra-fluentd=true') | map_from_pairs }}" -openshift_logging_fluentd_cpu_limit: 100m +openshift_logging_fluentd_cpu_limit: null +openshift_logging_fluentd_cpu_request: 100m openshift_logging_fluentd_memory_limit: 512Mi openshift_logging_fluentd_hosts: ['--all'] @@ -55,7 +56,7 @@ openshift_logging_fluentd_aggregating_passphrase: none #fluentd_throttle_contents: #fluentd_secureforward_contents: -openshift_logging_fluentd_file_buffer_limit: 1Gi +openshift_logging_fluentd_file_buffer_limit: 256Mi # Configure fluentd to tail audit log file and filter out container engine's logs from there # These logs are then stored in ES operation index |