소스 검색

Sync environment variables FLUENTD/MUX_CPU_LIMIT FLUENTD/MUX_MEMORY_LIMIT with the resource limit values.

Noriko Hosoi 7 년 전
부모
커밋
806c9ae04f
2개의 변경된 파일16개의 추가작업 그리고 4개의 파일을 삭제
  1. 8 2
      roles/openshift_logging_fluentd/templates/fluentd.j2
  2. 8 2
      roles/openshift_logging_mux/templates/mux.j2

+ 8 - 2
roles/openshift_logging_fluentd/templates/fluentd.j2

@@ -98,9 +98,15 @@ 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
       volumes:
       - name: runlogjournal
         hostPath:

+ 8 - 2
roles/openshift_logging_mux/templates/mux.j2

@@ -108,9 +108,15 @@ spec:
         - name: "BUFFER_SIZE_LIMIT"
           value: "{{ openshift_logging_mux_buffer_size_limit }}"
         - name: "MUX_CPU_LIMIT"
-          value: "{{ openshift_logging_mux_cpu_limit }}"
+          valueFrom:
+            resourceFieldRef:
+              containerName: "mux"
+              resource: limits.cpu
         - name: "MUX_MEMORY_LIMIT"
-          value: "{{ openshift_logging_mux_memory_limit }}"
+          valueFrom:
+            resourceFieldRef:
+              containerName: "mux"
+              resource: limits.memory
       volumes:
       - name: config
         configMap: