Merge pull request #1355 from kube-logging/parsers-fix

fix: use a separate path to mount custom config for the operator

Author: pepov

e2e/syslog-ng-aggregator/syslog_ng_aggregator_test.go

@@ -64,6 +64,7 @@ func init() {
 }
 
 func TestSyslogNGIsRunningAndForwardingLogs(t *testing.T) {
+	t.Parallel()
 	ns := "test"
 	common.WithCluster("syslog-ng-1", t, func(t *testing.T, c common.Cluster) {
 		setup.LoggingOperator(t, c, setup.LoggingOperatorOptionFunc(func(options *setup.LoggingOperatorOptions) {

e2e/volumedrain/volumedrain_test.go

@@ -62,6 +62,7 @@ func init() {
 }
 
 func TestVolumeDrain_Downscale(t *testing.T) {
+	t.Parallel()
 	ns := "testing-1"
 	common.WithCluster("drain", t, func(t *testing.T, c common.Cluster) {
 		setup.LoggingOperator(t, c, setup.LoggingOperatorOptionFunc(func(options *setup.LoggingOperatorOptions) {
@@ -226,8 +227,9 @@ func TestVolumeDrain_Downscale(t *testing.T) {
 }
 
 func TestVolumeDrain_Downscale_DeleteVolume(t *testing.T) {
+	t.Parallel()
 	ns := "testing-2"
-	common.WithCluster("drain", t, func(t *testing.T, c common.Cluster) {
+	common.WithCluster("drain-2", t, func(t *testing.T, c common.Cluster) {
 		setup.LoggingOperator(t, c, setup.LoggingOperatorOptionFunc(func(options *setup.LoggingOperatorOptions) {
 			options.Config.DisableWebhook = true
 			options.Config.Namespace = ns

pkg/resources/fluentbit/config.go

@@ -17,14 +17,17 @@ package fluentbit
 const BaseConfigName = "fluent-bit.conf"
 const UpstreamConfigName = "upstream.conf"
 const CustomParsersConfigName = "custom-parsers.conf"
+const StockConfigPath = "/fluent-bit/etc"
+const StockBinPath = "/fluent-bit/bin/fluent-bit"
+const OperatorConfigPath = "/fluent-bit/etc-operator"
 
 var fluentBitConfigTemplate = `
 [SERVICE]
     Flush        {{ .Flush }}
     Grace        {{ .Grace }}
     Daemon       Off
     Log_Level    {{ .LogLevel }}
-    Parsers_File parsers.conf
+    Parsers_File {{ .DefaultParsers }}
     {{- if .CustomParsers }}
     Parsers_File {{ .CustomParsers }}
     {{- end }}

pkg/resources/fluentbit/configsecret.go

@@ -69,6 +69,7 @@ type fluentBitConfig struct {
 	FilterModify            []v1beta1.FilterModify
 	FluentForwardOutput     *fluentForwardOutputConfig
 	SyslogNGOutput          *syslogNGOutputConfig
+	DefaultParsers          string
 	CustomParsers           string
 }
 
@@ -191,8 +192,10 @@ func (r *Reconciler) configSecret() (runtime.Object, reconciler.DesiredState, er
 		FilterModify:            r.fluentbitSpec.FilterModify,
 	}
 
+	input.DefaultParsers = fmt.Sprintf("%s/%s", StockConfigPath, "parsers.conf")
+
 	if r.fluentbitSpec.CustomParsers != "" {
-		input.CustomParsers = fmt.Sprintf("/fluent-bit/etc/%s", CustomParsersConfigName)
+		input.CustomParsers = fmt.Sprintf("%s/%s", OperatorConfigPath, CustomParsersConfigName)
 	}
 
 	if r.fluentbitSpec.Metrics != nil {

pkg/resources/fluentbit/daemonset.go

@@ -124,6 +124,9 @@ func (r *Reconciler) fluentbitContainer() *corev1.Container {
 			Privileged:               r.fluentbitSpec.Security.SecurityContext.Privileged,
 			SELinuxOptions:           r.fluentbitSpec.Security.SecurityContext.SELinuxOptions,
 		},
+		Command: []string{
+			StockBinPath, "-c", fmt.Sprintf("%s/%s", OperatorConfigPath, BaseConfigName),
+		},
 		Env:            r.fluentbitSpec.EnvVars,
 		LivenessProbe:  r.fluentbitSpec.LivenessProbe,
 		ReadinessProbe: r.fluentbitSpec.ReadinessProbe,
@@ -155,7 +158,7 @@ func (r *Reconciler) generateVolumeMounts() (v []corev1.VolumeMount) {
 		},
 		{
 			Name:      "config",
-			MountPath: "/fluent-bit/etc/",
+			MountPath: OperatorConfigPath,
 		},
 	}