Skip to content

Commit e89a42f

Browse files
csatib02csatib02
authored
Merge pull request #2141 from kube-logging/fix/eventtailer-chart
fix(chart): eventtailer defaults
2 parents 6f58205 + 04b5ffe commit e89a42f

File tree

3 files changed

+56
-41
lines changed

3 files changed

+56
-41
lines changed

‎charts/logging-operator/README.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -97,20 +97,20 @@ Use `createCustomResource=false` with Helm v3 to avoid trying to create CRDs fro
9797
| logging.enableDockerParserCompatibilityForCRI | bool | `false` | EnableDockerParserCompatibilityForCRI enables Docker log format compatibility for CRI workloads. |
9898
| logging.clusterFlows | list | `[]` | ClusterFlows to deploy |
9999
| logging.clusterOutputs | list | `[]` | ClusterOutputs to deploy |
100-
| logging.eventTailer.enabled | bool | `false` | |
101-
| logging.eventTailer.name | string | `"event-tailer"` | |
102-
| logging.eventTailer.image.repository | string | `nil` | repository of eventTailer image |
103-
| logging.eventTailer.image.tag | string | `nil` | tag of eventTailer image |
104-
| logging.eventTailer.image.pullPolicy | string | `nil` | pullPolicy of eventTailer image |
105-
| logging.eventTailer.image.imagePullSecrets | list | `[]` | imagePullSecrets of eventTailer image |
106-
| logging.eventTailer.pvc.enabled | bool | `true` | enable pvc for |
107-
| logging.eventTailer.pvc.accessModes | list | `["ReadWriteOnce"]` | storage class for event tailer pvc |
108-
| logging.eventTailer.pvc.volumeMode | string | `"Filesystem"` | storage class for event tailer pvc |
109-
| logging.eventTailer.pvc.storage | string | `"1Gi"` | storage for event tailer pvc |
110-
| logging.eventTailer.pvc.storageClassName | string | `nil` | storage class for event tailer pvc |
111-
| logging.eventTailer.workloadMetaOverrides | string | `nil` | workloadMetaOverrides |
112-
| logging.eventTailer.workloadOverrides | string | `nil` | workloadOverrides |
113-
| logging.eventTailer.containerOverrides | string | `nil` | containerOverrides |
100+
| logging.eventTailer.enabled | bool | `false` | Enable EventTailer |
101+
| logging.eventTailer.name | string | `"event-tailer"` | Name of the EventTailer resource |
102+
| logging.eventTailer.image.repository | string | `"ghcr.io/kube-logging/eventrouter"` | Repository of the EventTailer image |
103+
| logging.eventTailer.image.tag | string | `"0.4.0"` | Tag of the EventTailer image |
104+
| logging.eventTailer.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for the EventTailer image |
105+
| logging.eventTailer.image.imagePullSecrets | list | `[]` | Image pull secrets for the EventTailer image |
106+
| logging.eventTailer.pvc.enabled | bool | `true` | Enable PVC for position storage |
107+
| logging.eventTailer.pvc.accessModes | list | `["ReadWriteOnce"]` | Access modes for the PVC |
108+
| logging.eventTailer.pvc.volumeMode | string | `"Filesystem"` | Volume mode for the PVC |
109+
| logging.eventTailer.pvc.storage | string | `"1Gi"` | Storage size for the PVC |
110+
| logging.eventTailer.pvc.storageClassName | string | `""` | Storage class name for the PVC. If not set, the default storage class will be used |
111+
| logging.eventTailer.workloadMetaOverrides | object | `{}` | workloadMetaOverrides allows adding labels and annotations to the EventTailer workload |
112+
| logging.eventTailer.workloadOverrides | object | `{}` | workloadOverrides allows customization of the EventTailer workload (e.g., affinity, tolerations, resources) |
113+
| logging.eventTailer.containerOverrides | object | `{}` | containerOverrides allows customization of the EventTailer container (e.g., resources, env vars) |
114114
| logging.hostTailers.enabled | bool | `false` | Enable all hostTailers |
115115
| logging.hostTailers.instances | list | `[]` | List of hostTailers configurations |
116116
| testReceiver.enabled | bool | `false` | |

‎charts/logging-operator/templates/logging/eventtailer.yaml‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,43 @@
1+
{{- if and $.Values.logging.enabled $.Values.logging.eventTailer.enabled }}
12
{{- with $.Values.logging.eventTailer }}
2-
{{- if and $.Values.logging.enabled .enabled }}
33
apiVersion: logging-extensions.banzaicloud.io/v1alpha1
44
kind: EventTailer
55
metadata:
66
name: {{ .name }}
77
spec:
88
controlNamespace: {{ $.Values.logging.controlNamespace | default $.Release.Namespace }}
9-
{{- with .image }}
9+
{{- if or .image.repository .image.tag .image.pullPolicy .image.imagePullSecrets }}
1010
image:
11-
{{- toYaml . | nindent 4 }}
11+
{{- with .image.repository }}
12+
repository: {{ . }}
13+
{{- end }}
14+
{{- with .image.tag }}
15+
tag: {{ . | quote }}
16+
{{- end }}
17+
{{- with .image.pullPolicy }}
18+
pullPolicy: {{ . }}
19+
{{- end }}
20+
{{- with .image.imagePullSecrets }}
21+
imagePullSecrets: {{- toYaml . | nindent 6 }}
22+
{{- end }}
1223
{{- end }}
1324
{{- with .pvc }}
1425
{{- if .enabled }}
1526
positionVolume:
1627
pvc:
1728
spec:
18-
accessModes: {{ .accessModes }}
29+
{{- with .accessModes }}
30+
accessModes: {{- toYaml . | nindent 10 }}
31+
{{- end }}
1932
resources:
2033
requests:
2134
storage: {{ .storage }}
2235
volumeMode: {{ .volumeMode }}
2336
{{- with .storageClassName }}
2437
storageClassName: {{ . }}
2538
{{- end }}
26-
{{- end }}{{/* end if enabled */}}
27-
{{- end }}{{/* end with pvc */}}
39+
{{- end }}
40+
{{- end }}
2841
{{- with .workloadMetaOverrides }}
2942
workloadMetaOverrides:
3043
{{- toYaml . | nindent 4 }}
@@ -37,5 +50,5 @@ spec:
3750
containerOverrides:
3851
{{- toYaml . | nindent 4 }}
3952
{{- end }}
40-
{{- end }}{{/* end if enabled */}}
41-
{{- end }}{{/* end with event-tailer */}}
53+
{{- end }}
54+
{{- end }}

‎charts/logging-operator/values.yaml‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -242,35 +242,37 @@ logging:
242242

243243
# EventTailer config
244244
eventTailer:
245+
# -- Enable EventTailer
245246
enabled: false
247+
# -- Name of the EventTailer resource
246248
name: event-tailer
247249
image:
248-
# -- repository of eventTailer image
249-
repository:
250-
# -- tag of eventTailer image
251-
tag:
252-
# -- pullPolicy of eventTailer image
253-
pullPolicy:
254-
# -- imagePullSecrets of eventTailer image
250+
# -- Repository of the EventTailer image
251+
repository: ghcr.io/kube-logging/eventrouter
252+
# -- Tag of the EventTailer image
253+
tag: "0.4.0"
254+
# -- Image pull policy for the EventTailer image
255+
pullPolicy: IfNotPresent
256+
# -- Image pull secrets for the EventTailer image
255257
imagePullSecrets: []
256258
pvc:
257-
# -- enable pvc for
259+
# -- Enable PVC for position storage
258260
enabled: true
259-
# -- storage class for event tailer pvc
261+
# -- Access modes for the PVC
260262
accessModes:
261263
- ReadWriteOnce
262-
# -- storage class for event tailer pvc
264+
# -- Volume mode for the PVC
263265
volumeMode: Filesystem
264-
# -- storage for event tailer pvc
266+
# -- Storage size for the PVC
265267
storage: 1Gi
266-
# -- storage class for event tailer pvc
267-
storageClassName:
268-
# -- workloadMetaOverrides
269-
workloadMetaOverrides:
270-
# -- workloadOverrides
271-
workloadOverrides:
272-
# -- containerOverrides
273-
containerOverrides:
268+
# -- Storage class name for the PVC. If not set, the default storage class will be used
269+
storageClassName: ""
270+
# -- workloadMetaOverrides allows adding labels and annotations to the EventTailer workload
271+
workloadMetaOverrides: {}
272+
# -- workloadOverrides allows customization of the EventTailer workload (e.g., affinity, tolerations, resources)
273+
workloadOverrides: {}
274+
# -- containerOverrides allows customization of the EventTailer container (e.g., resources, env vars)
275+
containerOverrides: {}
274276

275277
hostTailers:
276278
# -- Enable all hostTailers

0 commit comments

Comments
 (0)