From fca96c0de5707f58ac284c3158419e9f4bca5c3b Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Fri, 26 Mar 2021 10:56:17 +0100
Subject: [PATCH] Reduce fluent-bit memory consumption under backpressure

---
 charts/kubezero-logging/Chart.yaml  | 4 ++--
 charts/kubezero-logging/values.yaml | 4 ++--
 scripts/publish.sh                  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/kubezero-logging/Chart.yaml b/charts/kubezero-logging/Chart.yaml
index a8225fe..d76fb78 100644
--- a/charts/kubezero-logging/Chart.yaml
+++ b/charts/kubezero-logging/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-logging
 description: KubeZero Umbrella Chart for complete EFK stack
 type: application
-version: 0.6.2
+version: 0.6.3
 appVersion: 1.4.1
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
@@ -28,4 +28,4 @@ dependencies:
   - name: fluent-bit
     version: 0.12.3
     condition: fluent-bit.enabled
-kubeVersion: ">= 1.16.0"
+kubeVersion: ">= 1.18.0"
diff --git a/charts/kubezero-logging/values.yaml b/charts/kubezero-logging/values.yaml
index 6cbd4c1..c62a8c0 100644
--- a/charts/kubezero-logging/values.yaml
+++ b/charts/kubezero-logging/values.yaml
@@ -227,7 +227,7 @@ fluent-bit:
       tls: false
 
     input:
-      memBufLimit: 16MB
+      memBufLimit: 4MB
       refreshInterval: 10
 
     logLevel: warn
@@ -256,7 +256,7 @@ fluent-bit:
           DB /var/log/flb_kube.db
           DB.Sync Normal
           {{- with .Values.config.input }}
-          Mem_Buf_Limit {{ default "16MB" .memBufLimit }}
+          Mem_Buf_Limit {{ default "4MB" .memBufLimit }}
           Refresh_Interval {{ default 10 .refreshInterval }}
           {{- end }}
 
diff --git a/scripts/publish.sh b/scripts/publish.sh
index 28117bc..791031f 100755
--- a/scripts/publish.sh
+++ b/scripts/publish.sh
@@ -11,7 +11,7 @@ GIT_PUSH=${GIT_PUSH:-true}
 [[ "$(git branch --show-current)" == "stable" || -n "$FORCE" ]] || { echo "Helm packages should only be built from stable branch !"; exit 1; }
 
 TMPDIR=$(mktemp -d kubezero-repo.XXX)
-mkdir -p $TMPDIR/stage
+mkdir -p $TMPDIR/stage && trap 'rm -rf $TMPDIR' ERR EXIT
 
 git clone -b gh-pages ssh://git@git.zero-downtime.net:22000/ZeroDownTime/KubeZero.git $TMPDIR/repo
 # Reset all