Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Feb 7, 2024

Conversation

MisterMX
Copy link
Contributor

@MisterMX MisterMX commented Feb 6, 2024

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.

Signed-off-by: Maximilian Blatt <maximilian.blatt-extern@deutschebahn.com>
@benjaminhuo
Copy link
Member

cc @wenchajun @wanjunlei

@benjaminhuo benjaminhuo merged commit 4233bb7 into fluent:master Feb 7, 2024
6 checks passed
@benjaminhuo
Copy link
Member

Thank you @MisterMX

@abacus3
Copy link

abacus3 commented Feb 7, 2024

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
Copy link
Contributor Author

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants