diff --git a/charts/logging-operator/README.md b/charts/logging-operator/README.md index 659c89055..08e19eece 100644 --- a/charts/logging-operator/README.md +++ b/charts/logging-operator/README.md @@ -97,20 +97,20 @@ Use `createCustomResource=false` with Helm v3 to avoid trying to create CRDs fro | logging.enableDockerParserCompatibilityForCRI | bool | `false` | EnableDockerParserCompatibilityForCRI enables Docker log format compatibility for CRI workloads. | | logging.clusterFlows | list | `[]` | ClusterFlows to deploy | | logging.clusterOutputs | list | `[]` | ClusterOutputs to deploy | -| logging.eventTailer.enabled | bool | `false` | | -| logging.eventTailer.name | string | `"event-tailer"` | | -| logging.eventTailer.image.repository | string | `nil` | repository of eventTailer image | -| logging.eventTailer.image.tag | string | `nil` | tag of eventTailer image | -| logging.eventTailer.image.pullPolicy | string | `nil` | pullPolicy of eventTailer image | -| logging.eventTailer.image.imagePullSecrets | list | `[]` | imagePullSecrets of eventTailer image | -| logging.eventTailer.pvc.enabled | bool | `true` | enable pvc for | -| logging.eventTailer.pvc.accessModes | list | `["ReadWriteOnce"]` | storage class for event tailer pvc | -| logging.eventTailer.pvc.volumeMode | string | `"Filesystem"` | storage class for event tailer pvc | -| logging.eventTailer.pvc.storage | string | `"1Gi"` | storage for event tailer pvc | -| logging.eventTailer.pvc.storageClassName | string | `nil` | storage class for event tailer pvc | -| logging.eventTailer.workloadMetaOverrides | string | `nil` | workloadMetaOverrides | -| logging.eventTailer.workloadOverrides | string | `nil` | workloadOverrides | -| logging.eventTailer.containerOverrides | string | `nil` | containerOverrides | +| logging.eventTailer.enabled | bool | `false` | Enable EventTailer | +| logging.eventTailer.name | string | `"event-tailer"` | Name of the EventTailer resource | +| logging.eventTailer.image.repository | string | `"ghcr.io/kube-logging/eventrouter"` | Repository of the EventTailer image | +| logging.eventTailer.image.tag | string | `"0.4.0"` | Tag of the EventTailer image | +| logging.eventTailer.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for the EventTailer image | +| logging.eventTailer.image.imagePullSecrets | list | `[]` | Image pull secrets for the EventTailer image | +| logging.eventTailer.pvc.enabled | bool | `true` | Enable PVC for position storage | +| logging.eventTailer.pvc.accessModes | list | `["ReadWriteOnce"]` | Access modes for the PVC | +| logging.eventTailer.pvc.volumeMode | string | `"Filesystem"` | Volume mode for the PVC | +| logging.eventTailer.pvc.storage | string | `"1Gi"` | Storage size for the PVC | +| logging.eventTailer.pvc.storageClassName | string | `""` | Storage class name for the PVC. If not set, the default storage class will be used | +| logging.eventTailer.workloadMetaOverrides | object | `{}` | workloadMetaOverrides allows adding labels and annotations to the EventTailer workload | +| logging.eventTailer.workloadOverrides | object | `{}` | workloadOverrides allows customization of the EventTailer workload (e.g., affinity, tolerations, resources) | +| logging.eventTailer.containerOverrides | object | `{}` | containerOverrides allows customization of the EventTailer container (e.g., resources, env vars) | | logging.hostTailers.enabled | bool | `false` | Enable all hostTailers | | logging.hostTailers.instances | list | `[]` | List of hostTailers configurations | | testReceiver.enabled | bool | `false` | | diff --git a/charts/logging-operator/templates/logging/eventtailer.yaml b/charts/logging-operator/templates/logging/eventtailer.yaml index 830cf9b15..fa3b6b171 100644 --- a/charts/logging-operator/templates/logging/eventtailer.yaml +++ b/charts/logging-operator/templates/logging/eventtailer.yaml @@ -1,21 +1,34 @@ +{{- if and $.Values.logging.enabled $.Values.logging.eventTailer.enabled }} {{- with $.Values.logging.eventTailer }} -{{- if and $.Values.logging.enabled .enabled }} apiVersion: logging-extensions.banzaicloud.io/v1alpha1 kind: EventTailer metadata: name: {{ .name }} spec: controlNamespace: {{ $.Values.logging.controlNamespace | default $.Release.Namespace }} - {{- with .image }} + {{- if or .image.repository .image.tag .image.pullPolicy .image.imagePullSecrets }} image: - {{- toYaml . | nindent 4 }} + {{- with .image.repository }} + repository: {{ . }} + {{- end }} + {{- with .image.tag }} + tag: {{ . | quote }} + {{- end }} + {{- with .image.pullPolicy }} + pullPolicy: {{ . }} + {{- end }} + {{- with .image.imagePullSecrets }} + imagePullSecrets: {{- toYaml . | nindent 6 }} + {{- end }} {{- end }} {{- with .pvc }} {{- if .enabled }} positionVolume: pvc: spec: - accessModes: {{ .accessModes }} + {{- with .accessModes }} + accessModes: {{- toYaml . | nindent 10 }} + {{- end }} resources: requests: storage: {{ .storage }} @@ -23,8 +36,8 @@ spec: {{- with .storageClassName }} storageClassName: {{ . }} {{- end }} - {{- end }}{{/* end if enabled */}} - {{- end }}{{/* end with pvc */}} + {{- end }} + {{- end }} {{- with .workloadMetaOverrides }} workloadMetaOverrides: {{- toYaml . | nindent 4 }} @@ -37,5 +50,5 @@ spec: containerOverrides: {{- toYaml . | nindent 4 }} {{- end }} -{{- end }}{{/* end if enabled */}} -{{- end }}{{/* end with event-tailer */}} +{{- end }} +{{- end }} diff --git a/charts/logging-operator/values.yaml b/charts/logging-operator/values.yaml index 0270d4c7a..a33532169 100644 --- a/charts/logging-operator/values.yaml +++ b/charts/logging-operator/values.yaml @@ -242,35 +242,37 @@ logging: # EventTailer config eventTailer: + # -- Enable EventTailer enabled: false + # -- Name of the EventTailer resource name: event-tailer image: - # -- repository of eventTailer image - repository: - # -- tag of eventTailer image - tag: - # -- pullPolicy of eventTailer image - pullPolicy: - # -- imagePullSecrets of eventTailer image + # -- Repository of the EventTailer image + repository: ghcr.io/kube-logging/eventrouter + # -- Tag of the EventTailer image + tag: "0.4.0" + # -- Image pull policy for the EventTailer image + pullPolicy: IfNotPresent + # -- Image pull secrets for the EventTailer image imagePullSecrets: [] pvc: - # -- enable pvc for + # -- Enable PVC for position storage enabled: true - # -- storage class for event tailer pvc + # -- Access modes for the PVC accessModes: - ReadWriteOnce - # -- storage class for event tailer pvc + # -- Volume mode for the PVC volumeMode: Filesystem - # -- storage for event tailer pvc + # -- Storage size for the PVC storage: 1Gi - # -- storage class for event tailer pvc - storageClassName: - # -- workloadMetaOverrides - workloadMetaOverrides: - # -- workloadOverrides - workloadOverrides: - # -- containerOverrides - containerOverrides: + # -- Storage class name for the PVC. If not set, the default storage class will be used + storageClassName: "" + # -- workloadMetaOverrides allows adding labels and annotations to the EventTailer workload + workloadMetaOverrides: {} + # -- workloadOverrides allows customization of the EventTailer workload (e.g., affinity, tolerations, resources) + workloadOverrides: {} + # -- containerOverrides allows customization of the EventTailer container (e.g., resources, env vars) + containerOverrides: {} hostTailers: # -- Enable all hostTailers