[aws-for-fluent-bit] allow filter.mergeLogKey to be optional and expo…

…se filter.keepLog value (#339)
aws · Mar 30, 2021 · 4175077 · 4175077
1 parent 96fa27f
commit 4175077
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/stable/aws-for-fluent-bit/templates/configmap.yaml b/stable/aws-for-fluent-bit/templates/configmap.yaml
@@ -35,7 +35,10 @@ data:
         Match               {{ .Values.filter.match }}
         Kube_URL            {{ .Values.filter.kubeURL }}
         Merge_Log           {{ .Values.filter.mergeLog }}
+        {{- if .Values.filter.mergeLogKey }}
         Merge_Log_Key       {{ .Values.filter.mergeLogKey }}
+        {{- end }}
+        Keep_Log            {{ .Values.filter.keepLog }}
         K8S-Logging.Parser  {{ .Values.filter.k8sLoggingParser }}
         K8S-Logging.Exclude {{ .Values.filter.k8sLoggingExclude }}
 

diff --git a/stable/aws-for-fluent-bit/values.yaml b/stable/aws-for-fluent-bit/values.yaml
@@ -41,6 +41,7 @@ filter:
   kubeURL: "https://kubernetes.default.svc.cluster.local:443"
   mergeLog: "On"
   mergeLogKey: "data"
+  keepLog: "On"
   k8sLoggingParser: "On"
   k8sLoggingExclude: "On"