fix: 🐛 log mount

chore: 🤖 add request resources and tweak configmap
ministryofjustice · Jan 15, 2024 · 580e401 · 580e401
1 parent 24d3e19
commit 580e401
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/configmap.tf b/configmap.tf
@@ -21,8 +21,8 @@ resource "kubernetes_config_map" "fluent-bit-config" {
         HTTP_Listen                       0.0.0.0
         HTTP_Port                         2020
         Storage.path                      /var/log/flb-storage/
-        Storage.max_chunks_up             64
-        Storage.backlog.mem_limit         5MB
+        Storage.max_chunks_up             128
+        Storage.backlog.mem_limit         100MB
 
     [INPUT]
         Name                              tail
@@ -72,7 +72,7 @@ resource "kubernetes_config_map" "fluent-bit-config" {
         Keep_Log            On
         Merge_Log           On
         Merge_Log_Key       log_processed
-        Buffer_Size         1MB
+        Buffer_Size         5MB
 
     [FILTER]
         Name                              lua

diff --git a/templates/values.yaml.tpl b/templates/values.yaml.tpl
@@ -22,9 +22,13 @@ controller:
       configMap:
         name: logrotate-config
     - hostPath:
-        path: /var/log
+        path: /var/log/pods/
         type: ""
-      name: varlog
+      name: varlog-pods
+    - hostPath:
+        path: /var/log/containers/
+        type: ""
+      name: varlog-containers
     - hostPath:
         path: /var/lib/docker/containers
         type: ""
@@ -72,8 +76,10 @@ controller:
         mountPath: /fluent-bit/scripts/
       - name: logs-volume
         mountPath: /var/log/audit/
-      - mountPath: /var/log/
-        name: varlog
+      - name: varlog-pods
+        mountPath: /var/log/pods/
+      - name: varlog-containers
+        mountPath: /var/log/containers/
       - mountPath: /var/lib/docker/containers
         name: varlibdockercontainers
         readOnly: true
@@ -100,7 +106,10 @@ controller:
         mountPath: /home
       - name: logs-volume
         mountPath: /var/log/audit/
-
+      resources:
+        requests:
+          cpu: "100m"
+          memory: "500Mi"
 %{ endif ~}
 
   # -- Process Ingress objects without ingressClass annotation/ingressClassName field