Skip to content

Commit ad13e6c

Browse files
committed
chore: add back hosttailer
Signed-off-by: Bence Csati <bence.csati@axoflow.com>
1 parent f953c74 commit ad13e6c

File tree

4 files changed

+86
-4
lines changed

4 files changed

+86
-4
lines changed

charts/logging-operator/README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,16 @@ Use `createCustomResource=false` with Helm v3 to avoid trying to create CRDs fro
108108
| logging.eventTailer.workloadMetaOverrides | string | `nil` | workloadMetaOverrides |
109109
| logging.eventTailer.workloadOverrides | string | `nil` | workloadOverrides |
110110
| logging.eventTailer.containerOverrides | string | `nil` | containerOverrides |
111+
| logging.hostTailer.enabled | bool | `false` | HostTailer |
112+
| logging.hostTailer.name | string | `"hosttailer"` | name of HostTailer |
113+
| logging.hostTailer.image.repository | string | `nil` | repository of eventTailer image |
114+
| logging.hostTailer.image.tag | string | `nil` | tag of eventTailer image |
115+
| logging.hostTailer.image.pullPolicy | string | `nil` | pullPolicy of eventTailer image |
116+
| logging.hostTailer.image.imagePullSecrets | list | `[]` | imagePullSecrets of eventTailer image |
117+
| logging.hostTailer.workloadMetaOverrides | string | `nil` | workloadMetaOverrides of HostTailer |
118+
| logging.hostTailer.workloadOverrides | string | `nil` | workloadOverrides of HostTailer |
119+
| 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: |
120+
| logging.hostTailer.systemdTailers | list | `[]` | configure systemdTailers of HostTailer example: - name: system-sample disabled: false systemdFilter: kubelet.service maxEntries: 20 containerOverrides: image: |
111121
| logging.hostTailers.enabled | bool | `false` | Enable all hostTailers |
112122
| logging.hostTailers.instances | list | `[]` | List of hostTailers configurations |
113123
| testReceiver.enabled | bool | `false` | |

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
{{- if and $.Values.logging.enabled $.Values.logging.hostTailers.enabled }}
2-
{{- range .Values.logging.hostTailers.instances }}
3-
{{- if .enabled }}
1+
{{- with .Values.logging.hostTailer }}
2+
{{- if and $.Values.logging.enabled .enabled }}
43
---
54
apiVersion: logging-extensions.banzaicloud.io/v1alpha1
65
kind: HostTailer
@@ -30,4 +29,3 @@ spec:
3029
{{- end }}
3130
{{- end }}
3231
{{- end }}
33-
{{- end }}
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{{- if and $.Values.logging.enabled $.Values.logging.hostTailers.enabled }}
2+
{{- range .Values.logging.hostTailers.instances }}
3+
{{- if .enabled }}
4+
---
5+
apiVersion: logging-extensions.banzaicloud.io/v1alpha1
6+
kind: HostTailer
7+
metadata:
8+
name: {{ .name }}
9+
spec:
10+
{{- with .fileTailers }}
11+
fileTailers:
12+
{{- toYaml . | nindent 4 }}
13+
{{- end }}
14+
{{- with .systemdTailers }}
15+
systemdTailers:
16+
{{- toYaml . | nindent 4 }}
17+
{{- end }}
18+
enableRecreateWorkloadOnImmutableFieldChange: {{ $.Values.logging.enableRecreateWorkloadOnImmutableFieldChange }}
19+
{{- with .workloadMetaOverrides }}
20+
workloadMetaOverrides:
21+
{{- toYaml . | nindent 4 }}
22+
{{- end }}
23+
{{- with .workloadOverrides }}
24+
workloadOverrides:
25+
{{- toYaml . | nindent 4 }}
26+
{{- end }}
27+
{{- with .image }}
28+
image:
29+
{{- toYaml . | nindent 4 }}
30+
{{- end }}
31+
{{- end }}
32+
{{- end }}
33+
{{- end }}

charts/logging-operator/values.yaml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,47 @@ logging:
284284
# -- containerOverrides
285285
containerOverrides:
286286

287+
# DEPRECATED: HostTailer config will be removed, use hostTailers instead
288+
hostTailer:
289+
# -- HostTailer
290+
enabled: false
291+
# -- name of HostTailer
292+
name: hosttailer
293+
image:
294+
# -- repository of eventTailer image
295+
repository:
296+
# -- tag of eventTailer image
297+
tag:
298+
# -- pullPolicy of eventTailer image
299+
pullPolicy:
300+
# -- imagePullSecrets of eventTailer image
301+
imagePullSecrets: []
302+
# -- workloadMetaOverrides of HostTailer
303+
workloadMetaOverrides:
304+
# -- workloadOverrides of HostTailer
305+
workloadOverrides:
306+
# -- configure fileTailers of HostTailer
307+
# example:
308+
# - name: sample-file
309+
# path: /var/log/sample-file
310+
# disabled: false
311+
# buffer_max_size:
312+
# buffer_chunk_size:
313+
# skip_long_lines:
314+
# read_from_head: false
315+
# containerOverrides:
316+
# image:
317+
fileTailers: []
318+
# -- configure systemdTailers of HostTailer
319+
# example:
320+
# - name: system-sample
321+
# disabled: false
322+
# systemdFilter: kubelet.service
323+
# maxEntries: 20
324+
# containerOverrides:
325+
# image:
326+
systemdTailers: []
327+
287328
hostTailers:
288329
# -- Enable all hostTailers
289330
enabled: false

0 commit comments

Comments
 (0)