search

fluent / fluent-operator

Operate Fluent Bit and Fluentd in the Kubernetes way - Previously known as FluentBit Operator
Apache License 2.0
587 stars 250 forks source link

fix(fluentd): Use custom plugin content for hash generation #1059

Closed MisterMX closed 9 months ago

MisterMX commented 9 months ago

What this PR does / why we need it:

Which issue(s) this PR fixes:

This fixes a small issue regarding custom plugins by adding PluginStore.Content to the hash generation. Otherwise every custom plugin would have the same hash and only one would be added to the final config.

Since PluginStore.Content is empty for all plugins except custom ones it is safe to just set it when calculating the hash.

Does this PR introduced a user-facing change?

No.

Additional documentation, usage docs, etc.:

n.a.

benjaminhuo commented 9 months ago

cc @wenchajun @wanjunlei

benjaminhuo commented 9 months ago

Thank you @MisterMX

abacus3 commented 9 months ago

Thank! I can confirm it works now. Previously only a single ClusterInput was included in the fluentd config, now all selected ClusterInput definitions appear in the config secret. @benjaminhuo can we backport this to release-2.7 branch and cut release v2.7.1?

MisterMX commented 9 months ago

@benjaminhuo we would also really appreciate it if this could make it into a backport or fix release.