From 842f8117676ccd955d9f7843f94a523e0df7cdbf Mon Sep 17 00:00:00 2001 From: zhenyus Date: Wed, 16 Apr 2025 01:07:46 +0800 Subject: [PATCH] fix: update resource kinds to Parser and Output for consistency and correct configuration Signed-off-by: zhenyus --- .../templates/authentication/fluentbit.yaml | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/freeleaps/helm-pkg/authentication/templates/authentication/fluentbit.yaml b/freeleaps/helm-pkg/authentication/templates/authentication/fluentbit.yaml index f5664e6b..a57dfbd6 100644 --- a/freeleaps/helm-pkg/authentication/templates/authentication/fluentbit.yaml +++ b/freeleaps/helm-pkg/authentication/templates/authentication/fluentbit.yaml @@ -1,8 +1,9 @@ {{- if .Values.fluentbit.enabled }} apiVersion: fluentbit.fluent.io/v1alpha2 -kind: ClusterParser +kind: Parser metadata: name: {{ .Release.Name }}-log-parser + namespace: {{ .Release.Namespace | quote }} labels: app.kubernetes.io/name: {{ .Release.Name }}-log-parser spec: @@ -11,9 +12,10 @@ spec: timeFormat: {{ .Values.fluentbit.timeFormat | quote }} --- apiVersion: fluentbit.fluent.io/v1alpha2 -kind: ClusterOutput +kind: Output metadata: name: {{ .Release.Name }}-log-output + namespace: {{ .Release.Namespace | quote }} labels: app.kubernetes.io/name: {{ .Release.Name }}-log-output spec: @@ -23,22 +25,11 @@ spec: port: 24224 --- apiVersion: fluentbit.fluent.io/v1alpha2 -kind: ClusterInput -metadata: - name: {{ .Release.Name }}-log-input -spec: - tail: - path: {{ .Values.fluentbit.logPath | quote }} - parser: {{ .Release.Name }}-log-parser ---- -apiVersion: fluentbit.fluent.io/v1alpha2 -kind: ClusterFluentBitConfig +kind: FluentBitConfig metadata: name: {{ .Release.Name }}-log-collector-config + namespace: {{ .Release.Namespace | quote }} spec: - inputSelector: - matchLabels: - app.kubernetes.io/name: {{ .Release.Name }}-log-input outputSelector: matchLabels: app.kubernetes.io/name: {{ .Release.Name }}-log-output