fix(charts/logging-operator): Imprve hostTailer (enable and image)

Signed-off-by: genofire <[email protected]>
kube-logging · Nov 27, 2023 · e34dcfb · e34dcfb
1 parent 218d145
commit e34dcfb
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 30 deletions.
diff --git a/charts/logging-operator/README.md b/charts/logging-operator/README.md
@@ -102,7 +102,16 @@ Use `createCustomResource=false` with Helm v3 to avoid trying to create CRDs fro
 | logging.eventTailer.workloadMetaOverrides | string | `nil` | workloadMetaOverrides |
 | logging.eventTailer.workloadOverrides | string | `nil` | workloadOverrides |
 | logging.eventTailer.containerOverrides | string | `nil` | containerOverrides |
-| logging.hostTailer | object | `{}` | HostTailer config |
+| logging.hostTailer.enabled | bool | `false` | HostTailer |
+| logging.hostTailer.name | string | `"hosttailer"` | name of HostTailer |
+| logging.hostTailer.image.repository | string | `nil` | repository of eventTailer image |
+| logging.hostTailer.image.tag | string | `nil` | tag of eventTailer image |
+| logging.hostTailer.image.pullPolicy | string | `nil` | pullPolicy of eventTailer image |
+| logging.hostTailer.image.imagePullSecrets | string | `nil` | imagePullSecrets of eventTailer image |
+| logging.hostTailer.workloadMetaOverrides | string | `nil` | workloadMetaOverrides of HostTailer |
+| 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 |
+| logging.hostTailer.systemdTailers | list | `[]` | configure systemdTailers of HostTailer example:   - name: system-sample     disabled: false     maxEntries: 20     systemdFilter: kubelet.service |
 | testReceiver.enabled | bool | `false` |  |
 | testReceiver.image | string | `"fluent/fluent-bit"` |  |
 | testReceiver.pullPolicy | string | `"IfNotPresent"` |  |

diff --git a/charts/logging-operator/templates/logging/eventtailer.yaml b/charts/logging-operator/templates/logging/eventtailer.yaml
@@ -1,6 +1,5 @@
-{{ if .Values.logging.enabled -}}
 {{- with $.Values.logging.eventTailer }}
-{{- if .enabled }}
+{{- if and $.Values.logging.enabled .enabled }}
 apiVersion: logging-extensions.banzaicloud.io/v1alpha1
 kind: EventTailer
 metadata:
@@ -38,6 +37,5 @@ spec:
   containerOverrides:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-{{- end }}{{/* end if create */}}
+{{- end }}{{/* end if enabled */}}
 {{- end }}{{/* end with event-tailer */}}
-{{- end }}{{/* end if logging-enabled */}}
diff --git a/charts/logging-operator/templates/logging/hosttailer.yaml b/charts/logging-operator/templates/logging/hosttailer.yaml
@@ -1,26 +1,31 @@
-{{ if .Values.logging.enabled -}}
-{{- with $.Values.logging.hostTailer }}
+{{- with .Values.logging.hostTailer }}
+{{- if and $.Values.logging.enabled .enabled }}
+---
 apiVersion: logging-extensions.banzaicloud.io/v1alpha1
 kind: HostTailer
 metadata:
-  name: {{ .name | default "hosttailer" }}
+  name: {{ .name }}
 spec:
-  enableRecreateWorkloadOnImmutableFieldChange: {{ $.Values.logging.enableRecreateWorkloadOnImmutableFieldChange }}
-{{- with .workloadOverrides }}
-  workloadOverrides:
-{{ toYaml . | indent 4 }}
-{{- end }}
-{{- with .containerOverrides }}
-  containerOverrides:
-{{- toYaml . | nindent 4 }}
-{{- end }}
-{{- with .fileTailers }}
+  {{- with .fileTailers }}
   fileTailers:
-{{ toYaml . | indent 4 }}
-{{- end }}
-{{- with .systemdTailers }}
+    {{ toYaml . | indent 4 }}
+  {{- end }}
+  {{- with .systemdTailers }}
   systemdTailers:
-{{ toYaml . | indent 4 }}
-{{- end }}
+    {{ toYaml . | indent 4 }}
+  {{- end }}
+  enableRecreateWorkloadOnImmutableFieldChange: {{ $.Values.logging.enableRecreateWorkloadOnImmutableFieldChange }}
+  {{- with .workloadMetaOverrides }}
+  workloadMetaOverrides:
+    {{ toYaml . | indent 4 }}
+  {{- end }}
+  {{- with .workloadOverrides }}
+  workloadOverrides:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .image }}
+  image:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/logging-operator/values.yaml b/charts/logging-operator/values.yaml
@@ -272,18 +272,37 @@ logging:
     containerOverrides:
 
 
-  # -- HostTailer config
-  hostTailer: {}
-    # name: sample
-    # fileTailers:
+  hostTailer:
+    # -- HostTailer
+    enabled: false
+    # -- name of HostTailer
+    name: hosttailer
+    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
+    # example:
     #   - name: sample-file
     #     path: /var/log/sample-file
     #     disabled: false
-    # systemdTailers:
+    fileTailers: []
+    # -- configure systemdTailers of HostTailer
+    # example:
     #   - name: system-sample
     #     disabled: false
-  #     maxEntries: 20
-  #     systemdFilter: kubelet.service
+    #     maxEntries: 20
+    #     systemdFilter: kubelet.service
+    systemdTailers: []
 
 testReceiver:
   enabled: false