Merge pull request #1918 from kube-logging/feat/enable-multiple-hosttailers

feat(chart): enable defining multiple hosttailers

Author: csatib02

charts/logging-operator/README.md

@@ -118,6 +118,8 @@ Use `createCustomResource=false` with Helm v3 to avoid trying to create CRDs fro
 | logging.hostTailer.workloadOverrides | string | `nil` | workloadOverrides of HostTailer |
 | logging.hostTailer.fileTailers | list | `[]` | configure fileTailers of HostTailer example:   - name: sample-file     path: /var/log/sample-file     disabled: false     buffer_max_size:     buffer_chunk_size:     skip_long_lines:     read_from_head: false     containerOverrides:     image: |
 | logging.hostTailer.systemdTailers | list | `[]` | configure systemdTailers of HostTailer example:   - name: system-sample     disabled: false     systemdFilter: kubelet.service     maxEntries: 20     containerOverrides:     image: |
+| logging.hostTailers.enabled | bool | `false` | Enable all hostTailers |
+| logging.hostTailers.instances | list | `[]` | List of hostTailers configurations |
 | testReceiver.enabled | bool | `false` |  |
 | testReceiver.image | string | `"fluent/fluent-bit"` |  |
 | testReceiver.pullPolicy | string | `"IfNotPresent"` |  |

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

@@ -0,0 +1,33 @@
+{{- if and $.Values.logging.enabled $.Values.logging.hostTailers.enabled }}
+{{- range .Values.logging.hostTailers.instances }}
+{{- if .enabled }}
+---
+apiVersion: logging-extensions.banzaicloud.io/v1alpha1
+kind: HostTailer
+metadata:
+  name: {{ .name }}
+spec:
+  {{- with .fileTailers }}
+  fileTailers:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .systemdTailers }}
+  systemdTailers:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  enableRecreateWorkloadOnImmutableFieldChange: {{ $.Values.logging.enableRecreateWorkloadOnImmutableFieldChange }}
+  {{- with .workloadMetaOverrides }}
+  workloadMetaOverrides:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .workloadOverrides }}
+  workloadOverrides:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .image }}
+  image:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
+{{- end }}
+{{- end }}

charts/logging-operator/values.yaml

@@ -284,6 +284,7 @@ logging:
     # -- containerOverrides
     containerOverrides:
 
+  # DEPRECATED: HostTailer config will be removed, use hostTailers instead
   hostTailer:
     # -- HostTailer
     enabled: false
@@ -324,6 +325,47 @@ logging:
     #     image:
     systemdTailers: []
 
+  hostTailers:
+    # -- Enable all hostTailers
+    enabled: false
+    # -- List of hostTailers configurations
+    instances: []
+    # - name: hosttailer
+      # -- Enable hostTailer
+      # enabled: true
+      # image:
+        # -- repository of eventTailer image
+        # repository:
+        # -- tag of eventTailer image
+        # tag:
+        # -- pullPolicy of eventTailer image
+        # pullPolicy:
+        # -- imagePullSecrets of eventTailer image
+        # imagePullSecrets: []
+      # -- workloadMetaOverrides of HostTailer
+      # workloadMetaOverrides: {}
+      # -- workloadOverrides of HostTailer
+      # workloadOverrides: {}
+      # -- configure fileTailers of HostTailer
+      # fileTailers:
+      # - name: sample-file
+      #   path: /var/log/sample-file
+      #   disabled: false
+      #   buffer_max_size:
+      #   buffer_chunk_size:
+      #   skip_long_lines:
+      #   read_from_head: false
+      #   containerOverrides:
+      #   image:
+      # -- configure systemdTailers of HostTailer
+      # systemdTailers:
+      # - name: system-sample
+      #   disabled: false
+      #   systemdFilter: kubelet.service
+      #   maxEntries: 20
+      #   containerOverrides:
+      #   image:
+
 testReceiver:
   enabled: false
   image: fluent/fluent-bit