diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-15 12:53:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 12:53:48 -0400 |
| commit | 96b98a07e6cc6a7fb437383d5716d8147dd22fcd (patch) | |
| tree | 514a624dc4f992143b74f0a9d9a01c53c1a98094 /roles/openshift_logging_mux | |
| parent | 58960f7599c564c8e72ae8afb8d5a3804a4d7737 (diff) | |
| parent | 1bbac1e2e1b3ecc0b5ff4a43cfcdd770c3060a51 (diff) | |
| download | openshift-96b98a07e6cc6a7fb437383d5716d8147dd22fcd.tar.gz openshift-96b98a07e6cc6a7fb437383d5716d8147dd22fcd.tar.bz2 openshift-96b98a07e6cc6a7fb437383d5716d8147dd22fcd.tar.xz openshift-96b98a07e6cc6a7fb437383d5716d8147dd22fcd.zip | |
Merge pull request #4356 from nhosoi/mux_params-0
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging_mux')
| -rw-r--r-- | roles/openshift_logging_mux/defaults/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_logging_mux/templates/mux.j2 | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/roles/openshift_logging_mux/defaults/main.yml b/roles/openshift_logging_mux/defaults/main.yml index 10fa4372c..77e47d38c 100644 --- a/roles/openshift_logging_mux/defaults/main.yml +++ b/roles/openshift_logging_mux/defaults/main.yml @@ -10,7 +10,9 @@ 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: 1Gi +openshift_logging_mux_memory_limit: 2Gi +openshift_logging_mux_buffer_queue_limit: 1024 +openshift_logging_mux_buffer_size_limit: 1m openshift_logging_mux_replicas: 1 diff --git a/roles/openshift_logging_mux/templates/mux.j2 b/roles/openshift_logging_mux/templates/mux.j2 index 502cd3347..243698c6a 100644 --- a/roles/openshift_logging_mux/templates/mux.j2 +++ b/roles/openshift_logging_mux/templates/mux.j2 @@ -103,6 +103,14 @@ spec: value: "true" - name: MUX_ALLOW_EXTERNAL value: "{{ openshift_logging_mux_allow_external | default('false') }}" + - name: "BUFFER_QUEUE_LIMIT" + value: "{{ openshift_logging_mux_buffer_queue_limit }}" + - name: "BUFFER_SIZE_LIMIT" + value: "{{ openshift_logging_mux_buffer_size_limit }}" + - name: "MUX_CPU_LIMIT" + value: "{{ openshift_logging_mux_cpu_limit }}" + - name: "MUX_MEMORY_LIMIT" + value: "{{ openshift_logging_mux_memory_limit }}" volumes: - name: config configMap: |