Change the condition rule order

kube-logging · Mar 4, 2022 · a636738 · a636738
1 parent 36d1eca
commit a636738
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/pkg/resources/fluentbit/config.go b/pkg/resources/fluentbit/config.go
@@ -78,16 +78,15 @@ var fluentBitConfigTemplate = `
 [FILTER]
     Name modify
     Match *
-    {{- range $rule := $modify.Rules }}
-    {{- $operation :=  $rule.Operation }}
-    {{ $operation.Op }} {{ $operation.Key }} {{ if $operation.Value }}{{ $operation.Value }}{{ end }}
-    {{- end }}
-
     {{- range $condition := $modify.Conditions }}
     {{- $operation :=  $condition.Operation }}
     Condition {{ $operation.Op }} {{ $operation.Key }} {{ if $operation.Value }}{{ $operation.Value }}{{ end }}
     {{- end }}
 
+    {{- range $rule := $modify.Rules }}
+    {{- $operation :=  $rule.Operation }}
+    {{ $operation.Op }} {{ $operation.Key }} {{ if $operation.Value }}{{ $operation.Value }}{{ end }}
+    {{- end }}
 {{- end}}
 
 [OUTPUT]

diff --git a/pkg/sdk/static/gen/crds/generated.go b/pkg/sdk/static/gen/crds/generated.go