Skip to content

Commit 8c36977

Browse files
csatib02csatib02
authored
Merge pull request #2274 from xtayfjpk/feat/raw-fluentd-filter
feat/support raw fluentd filter
2 parents 8ea1c1c + d14c9f3 commit 8c36977

24 files changed

Lines changed: 939 additions & 11 deletions

‎CLAUDE.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,21 @@ make test
8181

8282
# Run a single test
8383
cd pkg/sdk && go test -run TestName -v ./logging/...
84-
# or for controller tests:
85-
go test -run TestName -v ./controllers/logging/...
84+
# or for controller tests (envtest binaries are only on the PATH that make sets up,
85+
# so pass them explicitly when invoking go test directly):
86+
ENVTEST_BINARY_ASSETS=$(pwd)/bin/envtest/bin go test -run TestName -v ./controllers/logging/...
8687

8788
# Check test coverage meets threshold
8889
make check-coverage
8990

9091
# Run e2e tests on KIND cluster
9192
make test-e2e
9293

94+
# Manual verification loop against the current kubectl context (e.g. a local KIND cluster):
95+
# install the CRDs, then run the operator out-of-cluster
96+
make install
97+
make run
98+
9399
# Run all checks (license + lint + test)
94100
make check
95101
```

‎charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_clusterflows.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,12 @@ spec:
717717
type: object
718718
type: array
719719
type: object
720+
raw:
721+
properties:
722+
config:
723+
maxLength: 65536
724+
type: string
725+
type: object
720726
record_modifier:
721727
properties:
722728
char_encoding:
@@ -1602,6 +1608,12 @@ spec:
16021608
type: object
16031609
type: array
16041610
type: object
1611+
raw:
1612+
properties:
1613+
config:
1614+
maxLength: 65536
1615+
type: string
1616+
type: object
16051617
record_modifier:
16061618
properties:
16071619
char_encoding:

‎charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_flows.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,12 @@ spec:
717717
type: object
718718
type: array
719719
type: object
720+
raw:
721+
properties:
722+
config:
723+
maxLength: 65536
724+
type: string
725+
type: object
720726
record_modifier:
721727
properties:
722728
char_encoding:
@@ -1586,6 +1592,12 @@ spec:
15861592
type: object
15871593
type: array
15881594
type: object
1595+
raw:
1596+
properties:
1597+
config:
1598+
maxLength: 65536
1599+
type: string
1600+
type: object
15891601
record_modifier:
15901602
properties:
15911603
char_encoding:

‎charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_loggings.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,12 @@ spec:
769769
type: object
770770
type: array
771771
type: object
772+
raw:
773+
properties:
774+
config:
775+
maxLength: 65536
776+
type: string
777+
type: object
772778
record_modifier:
773779
properties:
774780
char_encoding:
@@ -877,6 +883,8 @@ spec:
877883
type: object
878884
enableDockerParserCompatibilityForCRI:
879885
type: boolean
886+
enableRawFluentdFilter:
887+
type: boolean
880888
enableRecreateWorkloadOnImmutableFieldChange:
881889
type: boolean
882890
errorOutputRef:
@@ -7922,6 +7930,12 @@ spec:
79227930
type: object
79237931
type: array
79247932
type: object
7933+
raw:
7934+
properties:
7935+
config:
7936+
maxLength: 65536
7937+
type: string
7938+
type: object
79257939
record_modifier:
79267940
properties:
79277941
char_encoding:

‎charts/logging-operator/crds/logging.banzaicloud.io_clusterflows.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,12 @@ spec:
714714
type: object
715715
type: array
716716
type: object
717+
raw:
718+
properties:
719+
config:
720+
maxLength: 65536
721+
type: string
722+
type: object
717723
record_modifier:
718724
properties:
719725
char_encoding:
@@ -1599,6 +1605,12 @@ spec:
15991605
type: object
16001606
type: array
16011607
type: object
1608+
raw:
1609+
properties:
1610+
config:
1611+
maxLength: 65536
1612+
type: string
1613+
type: object
16021614
record_modifier:
16031615
properties:
16041616
char_encoding:

‎charts/logging-operator/crds/logging.banzaicloud.io_flows.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,12 @@ spec:
714714
type: object
715715
type: array
716716
type: object
717+
raw:
718+
properties:
719+
config:
720+
maxLength: 65536
721+
type: string
722+
type: object
717723
record_modifier:
718724
properties:
719725
char_encoding:
@@ -1583,6 +1589,12 @@ spec:
15831589
type: object
15841590
type: array
15851591
type: object
1592+
raw:
1593+
properties:
1594+
config:
1595+
maxLength: 65536
1596+
type: string
1597+
type: object
15861598
record_modifier:
15871599
properties:
15881600
char_encoding:

‎charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,12 @@ spec:
766766
type: object
767767
type: array
768768
type: object
769+
raw:
770+
properties:
771+
config:
772+
maxLength: 65536
773+
type: string
774+
type: object
769775
record_modifier:
770776
properties:
771777
char_encoding:
@@ -874,6 +880,8 @@ spec:
874880
type: object
875881
enableDockerParserCompatibilityForCRI:
876882
type: boolean
883+
enableRawFluentdFilter:
884+
type: boolean
877885
enableRecreateWorkloadOnImmutableFieldChange:
878886
type: boolean
879887
errorOutputRef:
@@ -7919,6 +7927,12 @@ spec:
79197927
type: object
79207928
type: array
79217929
type: object
7930+
raw:
7931+
properties:
7932+
config:
7933+
maxLength: 65536
7934+
type: string
7935+
type: object
79227936
record_modifier:
79237937
properties:
79247938
char_encoding:

‎config/crd/bases/logging.banzaicloud.io_clusterflows.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,12 @@ spec:
714714
type: object
715715
type: array
716716
type: object
717+
raw:
718+
properties:
719+
config:
720+
maxLength: 65536
721+
type: string
722+
type: object
717723
record_modifier:
718724
properties:
719725
char_encoding:
@@ -1599,6 +1605,12 @@ spec:
15991605
type: object
16001606
type: array
16011607
type: object
1608+
raw:
1609+
properties:
1610+
config:
1611+
maxLength: 65536
1612+
type: string
1613+
type: object
16021614
record_modifier:
16031615
properties:
16041616
char_encoding:

‎config/crd/bases/logging.banzaicloud.io_flows.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,12 @@ spec:
714714
type: object
715715
type: array
716716
type: object
717+
raw:
718+
properties:
719+
config:
720+
maxLength: 65536
721+
type: string
722+
type: object
717723
record_modifier:
718724
properties:
719725
char_encoding:
@@ -1583,6 +1589,12 @@ spec:
15831589
type: object
15841590
type: array
15851591
type: object
1592+
raw:
1593+
properties:
1594+
config:
1595+
maxLength: 65536
1596+
type: string
1597+
type: object
15861598
record_modifier:
15871599
properties:
15881600
char_encoding:

‎config/crd/bases/logging.banzaicloud.io_loggings.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,12 @@ spec:
766766
type: object
767767
type: array
768768
type: object
769+
raw:
770+
properties:
771+
config:
772+
maxLength: 65536
773+
type: string
774+
type: object
769775
record_modifier:
770776
properties:
771777
char_encoding:
@@ -874,6 +880,8 @@ spec:
874880
type: object
875881
enableDockerParserCompatibilityForCRI:
876882
type: boolean
883+
enableRawFluentdFilter:
884+
type: boolean
877885
enableRecreateWorkloadOnImmutableFieldChange:
878886
type: boolean
879887
errorOutputRef:
@@ -7919,6 +7927,12 @@ spec:
79197927
type: object
79207928
type: array
79217929
type: object
7930+
raw:
7931+
properties:
7932+
config:
7933+
maxLength: 65536
7934+
type: string
7935+
type: object
79227936
record_modifier:
79237937
properties:
79247938
char_encoding:

0 commit comments

Comments
 (0)