diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-27 15:11:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-27 15:11:38 -0700 |
| commit | 2c81304511afcf03b35583f85040fb7d0b83cad5 (patch) | |
| tree | 3c496a4e621fa6545385e4c9c9a3a70f3883c70c /roles/openshift_logging_fluentd | |
| parent | d40744574297204f5e7c326491ae1af07fab17ed (diff) | |
| parent | 205d03455cf37d66f3629de7951463d755b72b16 (diff) | |
| download | openshift-2c81304511afcf03b35583f85040fb7d0b83cad5.tar.gz openshift-2c81304511afcf03b35583f85040fb7d0b83cad5.tar.bz2 openshift-2c81304511afcf03b35583f85040fb7d0b83cad5.tar.xz openshift-2c81304511afcf03b35583f85040fb7d0b83cad5.zip | |
Merge pull request #5897 from jcantrill/1506073_cpu_request_match_limit
Automatic merge from submit-queue.
bug 1506073. Lower cpu request for logging when it exceeds limit
This PR fixes https://bugzilla.redhat.com/show_bug.cgi?id=1506073 by:
* Lowering the CPU request to match the limit when the request is greater then a specified limit
I have an open question on if this is an acceptable change of if it makes the outcome unexpected. Should we prefer to exit during the deployment and advise the operator to correct their inventory?
Diffstat (limited to 'roles/openshift_logging_fluentd')
| -rw-r--r-- | roles/openshift_logging_fluentd/tasks/main.yaml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/roles/openshift_logging_fluentd/tasks/main.yaml b/roles/openshift_logging_fluentd/tasks/main.yaml index f56810610..2f89c3f9f 100644 --- a/roles/openshift_logging_fluentd/tasks/main.yaml +++ b/roles/openshift_logging_fluentd/tasks/main.yaml @@ -154,7 +154,6 @@ path: "{{ generated_certs_dir }}/system.logging.fluentd.crt" # create Fluentd daemonset - # this should change based on the type of fluentd deployment to be done... # TODO: pass in aggregation configurations - name: Generate logging-fluentd daemonset definition @@ -173,7 +172,7 @@ fluentd_nodeselector_key: "{{ openshift_logging_fluentd_nodeselector.keys()[0] }}" fluentd_nodeselector_value: "{{ openshift_logging_fluentd_nodeselector.values()[0] }}" fluentd_cpu_limit: "{{ openshift_logging_fluentd_cpu_limit }}" - fluentd_cpu_request: "{{ openshift_logging_fluentd_cpu_request }}" + fluentd_cpu_request: "{{ openshift_logging_fluentd_cpu_request | min_cpu(openshift_logging_fluentd_cpu_limit | default(none)) }}" fluentd_memory_limit: "{{ openshift_logging_fluentd_memory_limit }}" audit_container_engine: "{{ openshift_logging_fluentd_audit_container_engine | default(False) | bool }}" audit_log_file: "{{ openshift_logging_fluentd_audit_file | default() }}" |