1 files changed, 20 insertions, 2 deletions
diff --git a/roles/openshift_logging_fluentd/templates/fluentd.j2 b/roles/openshift_logging_fluentd/templates/fluentd.j2
index a5695ee26..4b87379f6 100644
--- a/roles/openshift_logging_fluentd/templates/fluentd.j2
+++ b/roles/openshift_logging_fluentd/templates/fluentd.j2
@@ -62,6 +62,11 @@ spec:
         - name: dockerdaemoncfg
           mountPath: /etc/docker
           readOnly: true
+{% if openshift_logging_use_mux_client | bool %}
+        - name: muxcerts
+          mountPath: /etc/fluent/muxkeys
+          readOnly: true
+{% endif %}
         env:
         - name: "K8S_HOST_URL"
           value: "{{ openshift_logging_fluentd_master_url }}"
@@ -98,9 +103,17 @@ spec:
         - name: "BUFFER_SIZE_LIMIT"
           value: "{{ openshift_logging_fluentd_buffer_size_limit }}"
         - name: "FLUENTD_CPU_LIMIT"
-          value: "{{ openshift_logging_fluentd_cpu_limit }}"
+          valueFrom:
+            resourceFieldRef:
+              containerName: "{{ daemonset_container_name }}"
+              resource: limits.cpu
         - name: "FLUENTD_MEMORY_LIMIT"
-          value: "{{ openshift_logging_fluentd_memory_limit }}"
+          valueFrom:
+            resourceFieldRef:
+              containerName: "{{ daemonset_container_name }}"
+              resource: limits.memory
+        - name: "USE_MUX_CLIENT"
+          value: "{{ openshift_logging_use_mux_client | default('false') | lower }}"
       volumes:
       - name: runlogjournal
         hostPath:
@@ -129,3 +142,8 @@ spec:
       - name: dockerdaemoncfg
         hostPath:
           path: /etc/docker
+{% if openshift_logging_use_mux_client | bool %}
+      - name: muxcerts
+        secret:
+          secretName: logging-mux
+{% endif %}