chart: allow disabling fluentbit and/or fluentd in logging-operator-logging chart

Signed-off-by: Peter Wilcsinszky <[email protected]>

Author: pepov

e2e/charts/logging-operator-logging/templates/logging.yaml

@@ -17,7 +17,7 @@ spec:
   {{- with .Values.flowConfigOverride }}
   flowConfigOverride: {{ . }}
   {{- end }}
-  {{- if or .Values.tls.enabled .Values.fluentbit }}
+  {{- if and (not .Values.fluentbitDisabled) (or .Values.tls.enabled .Values.fluentbit) }}
   fluentbit:
     {{- if .Values.tls.enabled }}
     tls:
@@ -29,7 +29,7 @@ spec:
     {{- toYaml . | nindent 4 }}
     {{- end }}
   {{- end }}
-  {{- if or .Values.tls.enabled .Values.fluentd }}
+  {{- if and (not .Values.fluentdDisabled) (or .Values.tls.enabled .Values.fluentd) }}
   fluentd:
     {{- if .Values.tls.enabled }}
     tls:

e2e/charts/logging-operator-logging/values.yaml

@@ -31,9 +31,13 @@ skipInvalidResources: false
 # -- Override generated config. This is a raw configuration string for troubleshooting purposes.
 flowConfigOverride: ""
 
+# -- Flag to disable fluentbit completely
+fluentbitDisabled: false
 # -- Fluent-bit configurations https://kube-logging.github.io/docs/configuration/crds/v1beta1/fluentbit_types/
 fluentbit: {}
 
+# -- Flag to disable fluentd completely
+fluentdDisabled: false
 # -- Fluentd configurations https://kube-logging.github.io/docs/configuration/crds/v1beta1/fluentd_types/
 fluentd: {}
 # 20Gi persistent storage is configured for fluentd by default.