From 9dc2881f15ac34be0b762c7ff0e9ee08157beb16 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Sun, 7 Mar 2021 12:47:06 +0100
Subject: [PATCH] Remove unnecessary docker mount

---
 .../charts/fluent-bit/templates/_pod.tpl      |  6 ----
 charts/kubezero-logging/fluent-bit.patch      | 30 +++++++++++++++----
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl b/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl
index 8f98a850..251080af 100644
--- a/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl
+++ b/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl
@@ -65,9 +65,6 @@ containers:
     {{- if eq .Values.kind "DaemonSet" }}
       - name: varlog
         mountPath: /var/log
-      - name: varlibdockercontainers
-        mountPath: /var/lib/docker/containers
-        readOnly: true
       - name: etcmachineid
         mountPath: /etc/machine-id
         readOnly: true
@@ -88,9 +85,6 @@ volumes:
   - name: varlog
     hostPath:
       path: /var/log
-  - name: varlibdockercontainers
-    hostPath:
-      path: /var/lib/docker/containers
   - name: etcmachineid
     hostPath:
       path: /etc/machine-id
diff --git a/charts/kubezero-logging/fluent-bit.patch b/charts/kubezero-logging/fluent-bit.patch
index 61aa7912..c749edf2 100644
--- a/charts/kubezero-logging/fluent-bit.patch
+++ b/charts/kubezero-logging/fluent-bit.patch
@@ -1,6 +1,6 @@
 diff -tubNr charts/fluent-bit/Chart.yaml charts/fluent-bit.zdt/Chart.yaml
 --- charts/fluent-bit/Chart.yaml	2021-02-23 14:58:39.000000000 +0100
-+++ charts/fluent-bit.zdt/Chart.yaml	2021-03-07 12:31:23.633414382 +0100
++++ charts/fluent-bit.zdt/Chart.yaml	2021-03-07 12:32:34.360084252 +0100
 @@ -1,8 +1,8 @@
  annotations:
    artifacthub.io/changes: |
@@ -14,7 +14,7 @@ diff -tubNr charts/fluent-bit/Chart.yaml charts/fluent-bit.zdt/Chart.yaml
  icon: https://fluentbit.io/assets/img/logo1-default.png
 diff -tubNr charts/fluent-bit/templates/_pod.tpl charts/fluent-bit.zdt/templates/_pod.tpl
 --- charts/fluent-bit/templates/_pod.tpl	2021-02-23 14:58:39.000000000 +0100
-+++ charts/fluent-bit.zdt/templates/_pod.tpl	2021-03-07 12:29:53.300076962 +0100
++++ charts/fluent-bit.zdt/templates/_pod.tpl	2021-03-07 12:45:11.766785251 +0100
 @@ -13,6 +13,8 @@
  dnsConfig:
    {{- toYaml . | nindent 2 }}
@@ -24,9 +24,29 @@ diff -tubNr charts/fluent-bit/templates/_pod.tpl charts/fluent-bit.zdt/templates
  containers:
    - name: {{ .Chart.Name }}
      securityContext:
+@@ -63,9 +65,6 @@
+     {{- if eq .Values.kind "DaemonSet" }}
+       - name: varlog
+         mountPath: /var/log
+-      - name: varlibdockercontainers
+-        mountPath: /var/lib/docker/containers
+-        readOnly: true
+       - name: etcmachineid
+         mountPath: /etc/machine-id
+         readOnly: true
+@@ -86,9 +85,6 @@
+   - name: varlog
+     hostPath:
+       path: /var/log
+-  - name: varlibdockercontainers
+-    hostPath:
+-      path: /var/lib/docker/containers
+   - name: etcmachineid
+     hostPath:
+       path: /etc/machine-id
 diff -tubNr charts/fluent-bit/templates/clusterrole.yaml charts/fluent-bit.zdt/templates/clusterrole.yaml
 --- charts/fluent-bit/templates/clusterrole.yaml	2021-02-23 14:58:39.000000000 +0100
-+++ charts/fluent-bit.zdt/templates/clusterrole.yaml	2021-03-07 12:22:43.336724185 +0100
++++ charts/fluent-bit.zdt/templates/clusterrole.yaml	2021-03-07 12:32:34.363417586 +0100
 @@ -11,6 +11,8 @@
      resources:
        - pods
@@ -38,7 +58,7 @@ diff -tubNr charts/fluent-bit/templates/clusterrole.yaml charts/fluent-bit.zdt/t
        - list
 diff -tubNr charts/fluent-bit/templates/tests/test-connection.yaml charts/fluent-bit.zdt/templates/tests/test-connection.yaml
 --- charts/fluent-bit/templates/tests/test-connection.yaml	2021-02-23 14:58:39.000000000 +0100
-+++ charts/fluent-bit.zdt/templates/tests/test-connection.yaml	2021-03-05 18:52:29.723311108 +0100
++++ charts/fluent-bit.zdt/templates/tests/test-connection.yaml	2021-03-07 12:32:34.363417586 +0100
 @@ -1,3 +1,4 @@
 +{{- if .Values.testFramework.enabled }}
  apiVersion: v1
@@ -51,7 +71,7 @@ diff -tubNr charts/fluent-bit/templates/tests/test-connection.yaml charts/fluent
 +{{- end }}
 diff -tubNr charts/fluent-bit/values.yaml charts/fluent-bit.zdt/values.yaml
 --- charts/fluent-bit/values.yaml	2021-02-23 14:58:39.000000000 +0100
-+++ charts/fluent-bit.zdt/values.yaml	2021-03-05 18:52:29.723311108 +0100
++++ charts/fluent-bit.zdt/values.yaml	2021-03-07 12:32:34.363417586 +0100
 @@ -12,6 +12,7 @@
    # tag: