diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-12-15 10:31:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-15 10:31:27 -0800 |
| commit | e5a4fecbc35cbede7eb2fb23ed42ba8a2f06c3b3 (patch) | |
| tree | c9932132496f33e1b221d99f2c14946d18eccb68 | |
| parent | 5adc6b42c7569b72e23795c653b3d09965ee81ba (diff) | |
| parent | f1748bdcb0d9b14af2f319a02ff72afd9074fae0 (diff) | |
| download | openshift-e5a4fecbc35cbede7eb2fb23ed42ba8a2f06c3b3.tar.gz openshift-e5a4fecbc35cbede7eb2fb23ed42ba8a2f06c3b3.tar.bz2 openshift-e5a4fecbc35cbede7eb2fb23ed42ba8a2f06c3b3.tar.xz openshift-e5a4fecbc35cbede7eb2fb23ed42ba8a2f06c3b3.zip | |
Merge pull request #6450 from nhosoi/file_buffer_limit
Automatic merge from submit-queue.
openshift_logging_{fluentd,mux}_file_buffer_limit mismatch
. fixing a typo in fluentd template
. adjusting the default value of openshift_logging_mux_file_buffer_limit
| -rw-r--r-- | roles/openshift_logging_fluentd/templates/fluentd.j2 | 2 | ||||
| -rw-r--r-- | roles/openshift_logging_mux/defaults/main.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging_fluentd/templates/fluentd.j2 b/roles/openshift_logging_fluentd/templates/fluentd.j2 index 10283316c..c6256cf49 100644 --- a/roles/openshift_logging_fluentd/templates/fluentd.j2 +++ b/roles/openshift_logging_fluentd/templates/fluentd.j2 @@ -130,7 +130,7 @@ spec: containerName: "{{ daemonset_container_name }}" resource: limits.memory - name: "FILE_BUFFER_LIMIT" - value: "{{ openshift_logging_fluentd_file_buffer_limit | default('256i') }}" + value: "{{ openshift_logging_fluentd_file_buffer_limit | default('256Mi') }}" {% if openshift_logging_mux_client_mode is defined and ((openshift_logging_mux_allow_external is defined and openshift_logging_mux_allow_external | bool) or (openshift_logging_use_mux is defined and openshift_logging_use_mux | bool)) %} diff --git a/roles/openshift_logging_mux/defaults/main.yml b/roles/openshift_logging_mux/defaults/main.yml index 1e6c501bf..db6f23126 100644 --- a/roles/openshift_logging_mux/defaults/main.yml +++ b/roles/openshift_logging_mux/defaults/main.yml @@ -63,4 +63,4 @@ 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: 256Mi +openshift_logging_mux_file_buffer_limit: 2Gi |